aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2005-06-23 03:07:25 (GMT)
committerfluxgen <fluxgen>2005-06-23 03:07:25 (GMT)
commit5373f6d840abaa49685c15fee2f411e77472a7da (patch)
tree46da25845eac32769bad85c264e4edf335cc1783 /src/Toolbar.hh
parent18cf5862495aa6f37110c90286bb6c315a145526 (diff)
downloadfluxbox_pavel-5373f6d840abaa49685c15fee2f411e77472a7da.zip
fluxbox_pavel-5373f6d840abaa49685c15fee2f411e77472a7da.tar.bz2
moved window menu from FluxboxWindow to BScreen
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r--src/Toolbar.hh13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index ee9b20d..2f8bed6 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -31,6 +31,7 @@
31#include "LayerMenu.hh" 31#include "LayerMenu.hh"
32#include "ToolFactory.hh" 32#include "ToolFactory.hh"
33#include "ToolTheme.hh" 33#include "ToolTheme.hh"
34#include "fluxbox.hh"
34 35
35#include "FbTk/Timer.hh" 36#include "FbTk/Timer.hh"
36#include "FbTk/Resource.hh" 37#include "FbTk/Resource.hh"
@@ -54,7 +55,7 @@ class ImageControl;
54 55
55/// The toolbar. 56/// The toolbar.
56/// Handles iconbar, workspace name view and clock view 57/// Handles iconbar, workspace name view and clock view
57class Toolbar: public FbTk::EventHandler, public FbTk::Observer { 58class Toolbar: public FbTk::EventHandler, public FbTk::Observer, public LayerObject {
58public: 59public:
59 60
60 /// Toolbar placement on the screen 61 /// Toolbar placement on the screen
@@ -101,15 +102,15 @@ public:
101 102
102 void update(FbTk::Subject *subj); 103 void update(FbTk::Subject *subj);
103 104
104 FbTk::XLayerItem &layerItem() { return m_layeritem; } 105 int layerNumber() const { return const_cast<FbTk::XLayerItem &>(m_layeritem).getLayerNum(); }
105 106
106 inline const FbTk::Menu &menu() const { return m_toolbarmenu; } 107 inline const FbTk::Menu &menu() const { return m_toolbarmenu; }
107 inline FbTk::Menu &menu() { return m_toolbarmenu; } 108 inline FbTk::Menu &menu() { return m_toolbarmenu; }
108 inline FbTk::Menu &placementMenu() { return m_placementmenu; } 109 inline FbTk::Menu &placementMenu() { return m_placementmenu; }
109 inline const FbTk::Menu &placementMenu() const { return m_placementmenu; } 110 inline const FbTk::Menu &placementMenu() const { return m_placementmenu; }
110 111
111 inline FbTk::Menu &layermenu() { return m_layermenu; } 112 inline FbTk::Menu &layerMenu() { return m_layermenu; }
112 inline const FbTk::Menu &layermenu() const { return m_layermenu; } 113 inline const FbTk::Menu &layerMenu() const { return m_layermenu; }
113 114
114 /// are we hidden? 115 /// are we hidden?
115 inline bool isHidden() const { return m_hidden; } 116 inline bool isHidden() const { return m_hidden; }
@@ -163,8 +164,8 @@ private:
163 FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar 164 FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar
164 165
165 FbTk::XLayerItem m_layeritem; ///< layer item, must be declared before layermenu 166 FbTk::XLayerItem m_layeritem; ///< layer item, must be declared before layermenu
166 LayerMenu<Toolbar> m_layermenu; 167 LayerMenu m_layermenu;
167 FbMenu m_placementmenu, m_toolbarmenu; 168 FbMenu m_placementmenu, m_toolbarmenu;
168 169
169 170
170 // themes 171 // themes