change default resistance to 18

[chaz/openbox] / src / Toolbar.hh

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 31b35e7d74d00e29573569c12654ad805d17e657..45464e77e027e7ac890c4320cef54fc913dcc0c5 100644 (file)
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -90,7 +90,7 @@ private:
     Window window, workspace_label, window_label, clock, psbutton, nsbutton,
       pwbutton, nwbutton;
 
-    int x_hidden, y_hidden, hour, minute, grab_x, grab_y;
+    int x_hidden, y_hidden, hour, minute;
     unsigned int window_label_w, workspace_label_w, clock_w,
       button_w, bevel_w, label_h;
 
@@ -118,6 +118,7 @@ private:
   friend class Toolbarmenu;
   friend class Toolbarmenu::Placementmenu;
 
+  void drawArrow(Drawable surface, bool left) const;
   void redrawPrevWorkspaceButton(bool pressed = False, bool redraw = False);
   void redrawNextWorkspaceButton(bool pressed = False, bool redraw = False);
   void redrawPrevWindowButton(bool preseed = False, bool redraw = False);
@@ -155,24 +156,29 @@ public:
   void save_rc(void);
   void load_rc(void);
 
+  void mapToolbar(void);
+  void unmapToolbar(void);
+
   inline Window getWindowID(void) const { return frame.window; }
 
   inline const Rect& getRect(void) const { return frame.rect; }
   inline unsigned int getWidth(void) const { return frame.rect.width(); }
   inline unsigned int getHeight(void) const { return frame.rect.height(); }
   inline unsigned int getExposedHeight(void) const
-  { return ((do_auto_hide) ? frame.bevel_w : frame.rect.height()); }
+  { return (screen->doHideToolbar() ? 0 :
+            ((do_auto_hide) ? frame.bevel_w :
+             frame.rect.height())); }
   inline int getX(void) const
   { return ((hidden) ? frame.x_hidden : frame.rect.x()); }
   inline int getY(void) const
   { return ((hidden) ? frame.y_hidden : frame.rect.y()); }
 
-  void buttonPressEvent(XButtonEvent *be);
-  void buttonReleaseEvent(XButtonEvent *re);
-  void enterNotifyEvent(XCrossingEvent * /*unused*/);
-  void leaveNotifyEvent(XCrossingEvent * /*unused*/);
-  void exposeEvent(XExposeEvent *ee);
-  void keyPressEvent(XKeyEvent *ke);
+  void buttonPressEvent(const XButtonEvent *be);
+  void buttonReleaseEvent(const XButtonEvent *re);
+  void enterNotifyEvent(const XCrossingEvent * /*unused*/);
+  void leaveNotifyEvent(const XCrossingEvent * /*unused*/);
+  void exposeEvent(const XExposeEvent *ee);
+  void keyPressEvent(const XKeyEvent *ke);
 
   void edit(void);
   void reconfigure(void);