diff options
Diffstat (limited to 'src/IconbarTool.hh')
-rw-r--r-- | src/IconbarTool.hh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh index 92fbe63..118eacf 100644 --- a/src/IconbarTool.hh +++ b/src/IconbarTool.hh | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #include "FbTk/Container.hh" | 29 | #include "FbTk/Container.hh" |
30 | #include "FbTk/CachedPixmap.hh" | 30 | #include "FbTk/CachedPixmap.hh" |
31 | #include "FbTk/Observer.hh" | ||
32 | #include "FbTk/Resource.hh" | 31 | #include "FbTk/Resource.hh" |
33 | 32 | ||
34 | #include <map> | 33 | #include <map> |
@@ -39,7 +38,7 @@ class IconButton; | |||
39 | class Focusable; | 38 | class Focusable; |
40 | class FocusableList; | 39 | class FocusableList; |
41 | 40 | ||
42 | class IconbarTool: public ToolbarItem, public FbTk::Observer { | 41 | class IconbarTool: public ToolbarItem { |
43 | public: | 42 | public: |
44 | typedef std::map<Focusable *, IconButton *> IconMap; | 43 | typedef std::map<Focusable *, IconButton *> IconMap; |
45 | 44 | ||
@@ -54,7 +53,6 @@ public: | |||
54 | void moveResize(int x, int y, | 53 | void moveResize(int x, int y, |
55 | unsigned int width, unsigned int height); | 54 | unsigned int width, unsigned int height); |
56 | 55 | ||
57 | void update(FbTk::Subject *subj); | ||
58 | void show(); | 56 | void show(); |
59 | void hide(); | 57 | void hide(); |
60 | void setAlignment(FbTk::Container::Alignment a); | 58 | void setAlignment(FbTk::Container::Alignment a); |
@@ -72,6 +70,7 @@ public: | |||
72 | 70 | ||
73 | const BScreen &screen() const { return m_screen; } | 71 | const BScreen &screen() const { return m_screen; } |
74 | private: | 72 | private: |
73 | enum UpdateReason { LIST_ORDER, LIST_ADD, LIST_REMOVE, LIST_RESET, ALIGN }; | ||
75 | 74 | ||
76 | void updateSizing(); | 75 | void updateSizing(); |
77 | 76 | ||
@@ -95,6 +94,9 @@ private: | |||
95 | /// add icons to the list | 94 | /// add icons to the list |
96 | void updateList(); | 95 | void updateList(); |
97 | 96 | ||
97 | /// called when the list emits a signal | ||
98 | void update(UpdateReason reason, Focusable *win); | ||
99 | |||
98 | void themeReconfigured(); | 100 | void themeReconfigured(); |
99 | 101 | ||
100 | BScreen &m_screen; | 102 | BScreen &m_screen; |