aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-29 00:44:41 (GMT)
committerfluxgen <fluxgen>2003-08-29 00:44:41 (GMT)
commit76c1bd4b62ed62ffae1f3f6da8dde9716440d87c (patch)
tree121b78bbf53389c6b38ad0aa2e2feecd978b29a4 /src/Toolbar.hh
parent028897367989bc2d7402e4d9920fdf8889034162 (diff)
downloadfluxbox_pavel-76c1bd4b62ed62ffae1f3f6da8dde9716440d87c.zip
fluxbox_pavel-76c1bd4b62ed62ffae1f3f6da8dde9716440d87c.tar.bz2
fixed workspace theme for old themes
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r--src/Toolbar.hh8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 981fb1a..719dac3 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.hh,v 1.45 2003/08/28 13:58:17 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.46 2003/08/29 00:44:41 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -114,8 +114,6 @@ public:
114 inline FbTk::Menu &layermenu() { return m_layermenu; } 114 inline FbTk::Menu &layermenu() { return m_layermenu; }
115 inline const FbTk::Menu &layermenu() const { return m_layermenu; } 115 inline const FbTk::Menu &layermenu() const { return m_layermenu; }
116 116
117 /// are we in workspacename editing?
118 inline bool isEditing() const { return m_editing; }
119 /// are we hidden? 117 /// are we hidden?
120 inline bool isHidden() const { return m_hidden; } 118 inline bool isHidden() const { return m_hidden; }
121 /// do we auto hide the toolbar? 119 /// do we auto hide the toolbar?
@@ -146,7 +144,6 @@ private:
146 void clearStrut(); 144 void clearStrut();
147 void updateStrut(); 145 void updateStrut();
148 146
149 bool m_editing; ///< edit workspace label mode
150 bool m_hidden; ///< hidden state 147 bool m_hidden; ///< hidden state
151 148
152 /// Toolbar frame 149 /// Toolbar frame
@@ -171,7 +168,8 @@ private:
171 168
172 // themes 169 // themes
173 ToolbarTheme m_theme; 170 ToolbarTheme m_theme;
174 ToolTheme m_clock_theme, m_workspace_theme; 171 ToolTheme m_clock_theme;
172 std::auto_ptr<ToolTheme> m_workspace_theme;
175 IconbarTheme m_iconbar_theme; 173 IconbarTheme m_iconbar_theme;
176 174
177 FbTk::XLayerItem m_layeritem; 175 FbTk::XLayerItem m_layeritem;