X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.hh;h=ae8353baec7d9f30f51962a1e2028cbe45cb88a1;hb=6d4aa1af4e6377602e051cccb881fbd357f34de7;hp=31b35e7d74d00e29573569c12654ad805d17e657;hpb=0305cbdc3ae8525c74b2bb9b23884035549e3407;p=chaz%2Fopenbox

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 31b35e7d..ae8353ba 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -155,24 +155,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);