aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-28 09:14:19 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-28 09:14:19 (GMT)
commit0f6b73f36abb1fd31893ef16413f010e78ed84ab (patch)
tree68ebeaae3db4e0708f1d430c828a77ebce86c9f1 /src/FbTk/Menu.cc
parent2940869cd7cc1688be5114451380275c9a85f5d1 (diff)
downloadfluxbox-0f6b73f36abb1fd31893ef16413f010e78ed84ab.zip
fluxbox-0f6b73f36abb1fd31893ef16413f010e78ed84ab.tar.bz2
move shape handling from FbMenu to FbTk::Menu
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r--src/FbTk/Menu.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 485b56c..00dcc54 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -92,6 +92,7 @@ Menu::Menu(MenuTheme &tm, ImageControl &imgctrl):
92 m_screen_height(DisplayHeight(FbTk::App::instance()->display(), tm.screenNum())), 92 m_screen_height(DisplayHeight(FbTk::App::instance()->display(), tm.screenNum())),
93 m_alignment(ALIGNDONTCARE), 93 m_alignment(ALIGNDONTCARE),
94 m_active_index(-1), 94 m_active_index(-1),
95 m_shape(new Shape(fbwindow(), tm.shapePlaces())),
95 m_need_update(true) { 96 m_need_update(true) {
96 // setup timers 97 // setup timers
97 98
@@ -496,6 +497,7 @@ void Menu::updateMenu(int active_index) {
496 497
497 clearWindow(); 498 clearWindow();
498 m_need_update = false; 499 m_need_update = false;
500 m_shape->update();
499} 501}
500 502
501 503
@@ -563,6 +565,7 @@ void Menu::clearWindow() {
563 for (size_t i = 0; i < menuitems.size(); i++) { 565 for (size_t i = 0; i < menuitems.size(); i++) {
564 clearItem(i, false); // no clear 566 clearItem(i, false); // no clear
565 } 567 }
568 m_shape->update();
566} 569}
567 570
568void Menu::redrawFrame(FbDrawable &drawable) { 571void Menu::redrawFrame(FbDrawable &drawable) {
@@ -1091,6 +1094,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
1091 1094
1092 1095
1093void Menu::reconfigure() { 1096void Menu::reconfigure() {
1097 m_shape->setPlaces(theme().shapePlaces());
1094 1098
1095 if (FbTk::Transparent::haveComposite()) { 1099 if (FbTk::Transparent::haveComposite()) {
1096 menu.window.setOpaque(alpha()); 1100 menu.window.setOpaque(alpha());