aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-19 21:28:57 (GMT)
committerfluxgen <fluxgen>2003-08-19 21:28:57 (GMT)
commit2ccb04a1db2056d49c51ed930ae20fb500bd863e (patch)
treeb67854a99a29fffcae7cbaa4dfe278e3d95f0cd1 /src/Toolbar.hh
parentc7dbf0dd65b318f69a5046ec909a330c74a7a8a5 (diff)
downloadfluxbox_pavel-2ccb04a1db2056d49c51ed930ae20fb500bd863e.zip
fluxbox_pavel-2ccb04a1db2056d49c51ed930ae20fb500bd863e.tar.bz2
fixed some theme items
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r--src/Toolbar.hh12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 4f75d89..3e9878c 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.43 2003/08/15 13:25:03 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.44 2003/08/19 21:28:57 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -158,6 +158,8 @@ private:
158 int x, y, x_hidden, y_hidden, grab_x, grab_y; 158 int x, y, x_hidden, y_hidden, grab_x, grab_y;
159 unsigned int width, height, bevel_w; 159 unsigned int width, height, bevel_w;
160 } frame; 160 } frame;
161 // background pixmap
162 Pixmap m_window_pm;
161 163
162 BScreen &m_screen; ///< screen connection 164 BScreen &m_screen; ///< screen connection
163 165
@@ -166,14 +168,17 @@ private:
166 FbTk::Menu m_placementmenu; 168 FbTk::Menu m_placementmenu;
167 LayerMenu<Toolbar> m_layermenu; 169 LayerMenu<Toolbar> m_layermenu;
168 170
169 171 // themes
170 ToolbarTheme m_theme; 172 ToolbarTheme m_theme;
173 ToolTheme m_clock_theme, m_workspace_theme;
174 IconbarTheme m_iconbar_theme;
171 175
172 FbTk::XLayerItem m_layeritem; 176 FbTk::XLayerItem m_layeritem;
173 typedef std::list<ToolbarItem *> ItemList; 177 typedef std::list<ToolbarItem *> ItemList;
174 ItemList m_item_list; 178 ItemList m_item_list;
175 179
176 Strut *m_strut; ///< created and destroyed by BScreen 180 Strut *m_strut; ///< created and destroyed by BScreen
181
177 // resources 182 // resources
178 FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over; 183 FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over;
179 FbTk::Resource<int> m_rc_width_percent; 184 FbTk::Resource<int> m_rc_width_percent;
@@ -183,8 +188,7 @@ private:
183 FbTk::Resource<int> m_rc_height; 188 FbTk::Resource<int> m_rc_height;
184 std::auto_ptr<Shape> m_shape; 189 std::auto_ptr<Shape> m_shape;
185 190
186 ToolTheme m_clock_theme, m_workspace_theme; 191
187 IconbarTheme m_iconbar_theme;
188 bool m_resize_lock; ///< to lock rearrangeItems or not 192 bool m_resize_lock; ///< to lock rearrangeItems or not
189}; 193};
190 194