diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 09:14:19 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 09:14:19 (GMT) |
commit | 0f6b73f36abb1fd31893ef16413f010e78ed84ab (patch) | |
tree | 68ebeaae3db4e0708f1d430c828a77ebce86c9f1 /src/FbMenu.cc | |
parent | 2940869cd7cc1688be5114451380275c9a85f5d1 (diff) | |
download | fluxbox-0f6b73f36abb1fd31893ef16413f010e78ed84ab.zip fluxbox-0f6b73f36abb1fd31893ef16413f010e78ed84ab.tar.bz2 |
move shape handling from FbMenu to FbTk::Menu
Diffstat (limited to 'src/FbMenu.cc')
-rw-r--r-- | src/FbMenu.cc | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/FbMenu.cc b/src/FbMenu.cc index 65fbecd..941ca0e 100644 --- a/src/FbMenu.cc +++ b/src/FbMenu.cc | |||
@@ -25,36 +25,13 @@ | |||
25 | #include "FbMenu.hh" | 25 | #include "FbMenu.hh" |
26 | 26 | ||
27 | #include "fluxbox.hh" | 27 | #include "fluxbox.hh" |
28 | #include "FbTk/MenuTheme.hh" | ||
29 | #include "Screen.hh" | 28 | #include "Screen.hh" |
30 | 29 | ||
31 | #include "FbTk/Shape.hh" | ||
32 | |||
33 | FbMenu::FbMenu(FbTk::MenuTheme &tm, FbTk::ImageControl &imgctrl, | 30 | FbMenu::FbMenu(FbTk::MenuTheme &tm, FbTk::ImageControl &imgctrl, |
34 | FbTk::XLayer &layer): | 31 | FbTk::XLayer &layer): |
35 | FbTk::Menu(tm, imgctrl), | 32 | FbTk::Menu(tm, imgctrl), |
36 | m_layeritem(fbwindow(), layer), | 33 | m_layeritem(fbwindow(), layer) { |
37 | m_shape(new FbTk::Shape(fbwindow(), tm.shapePlaces())) { | ||
38 | |||
39 | } | ||
40 | |||
41 | FbMenu::~FbMenu() { | ||
42 | |||
43 | } | ||
44 | |||
45 | void FbMenu::updateMenu(int index) { | ||
46 | FbTk::Menu::updateMenu(index); | ||
47 | m_shape->update(); | ||
48 | } | ||
49 | |||
50 | void FbMenu::clearWindow() { | ||
51 | FbTk::Menu::clearWindow(); | ||
52 | m_shape->update(); | ||
53 | } | ||
54 | 34 | ||
55 | void FbMenu::reconfigure() { | ||
56 | m_shape->setPlaces(theme().shapePlaces()); | ||
57 | FbTk::Menu::reconfigure(); | ||
58 | } | 35 | } |
59 | 36 | ||
60 | void FbMenu::buttonReleaseEvent(XButtonEvent &be) { | 37 | void FbMenu::buttonReleaseEvent(XButtonEvent &be) { |