X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=ed8bed4be43a1822c2b30dea86c7221a28621c6d;hb=6dfc3c726a2164ba70cfac3df436ee035822bdb1;hp=36b08b06013560a1a92c618b3249e1077378c8e7;hpb=9005a02c5c4355ca18c1d070072bb9fbe0f2c040;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 36b08b06..ed8bed4b 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -189,7 +189,7 @@ void dock_add(Window win, XWMHints *wmhints)
     ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
 }
 
-void dock_remove_all()
+void dock_remove_all(void)
 {
     while (dock->dock_apps)
         dock_remove(dock->dock_apps->data, TRUE);
@@ -219,7 +219,7 @@ void dock_remove(ObDockApp *app, gboolean reparent)
     g_free(app);
 }
 
-void dock_configure()
+void dock_configure(void)
 {
     GList *it;
     gint hspot, vspot;
@@ -227,8 +227,10 @@ void dock_configure()
     gint l, r, t, b;
     gint strw, strh;
     Rect *a;
+    gint hidesize;
 
     RrMargins(dock->a_frame, &l, &t, &r, &b);
+    hidesize = MAX(1, ob_rr_theme->obwidth);
 
     dock->area.width = dock->area.height = 0;
 
@@ -361,51 +363,51 @@ void dock_configure()
             case OB_DIRECTION_NORTHWEST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y -= dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x -= dock->area.width - hidesize;
                     break;
                 }
                 break;
             case OB_DIRECTION_NORTH:
-                dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+                dock->area.y -= dock->area.height - hidesize;
                 break;
             case OB_DIRECTION_NORTHEAST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y -= dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x += dock->area.width - hidesize;
                     break;
                 }
                 break;
             case OB_DIRECTION_WEST:
-                dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+                dock->area.x -= dock->area.width - hidesize;
                 break;
             case OB_DIRECTION_EAST:
-                dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+                dock->area.x += dock->area.width - hidesize;
                 break;
             case OB_DIRECTION_SOUTHWEST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y += dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x -= dock->area.width - hidesize;
                     break;
                 } break;
             case OB_DIRECTION_SOUTH:
-                dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+                dock->area.y += dock->area.height - hidesize;
                 break;
             case OB_DIRECTION_SOUTHEAST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y += dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x += dock->area.width - hidesize;
                     break;
                 }
                 break;
@@ -414,8 +416,8 @@ void dock_configure()
     }
 
     if (!config_dock_floating && config_dock_hide) {
-        strw = ob_rr_theme->obwidth;
-        strh = ob_rr_theme->obwidth;
+        strw = hidesize;
+        strh = hidesize;
     } else {
         strw = dock->area.width;
         strh = dock->area.height;
@@ -628,15 +630,17 @@ void dock_hide(gboolean hide)
 {
     if (!hide) {
         if (dock->hidden && config_dock_hide) {
-            ob_main_loop_timeout_add(ob_main_loop, config_dock_show_delay,
-                                 show_timeout, NULL, g_direct_equal, NULL);
+            ob_main_loop_timeout_add(ob_main_loop,
+                                     config_dock_show_delay * 1000,
+                                     show_timeout, NULL, g_direct_equal, NULL);
         } else if (!dock->hidden && config_dock_hide) {
             ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
         }
     } else {
         if (!dock->hidden && config_dock_hide) {
-            ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay,
-                                 hide_timeout, NULL, g_direct_equal, NULL);
+            ob_main_loop_timeout_add(ob_main_loop,
+                                     config_dock_hide_delay * 1000,
+                                     hide_timeout, NULL, g_direct_equal, NULL);
         } else if (dock->hidden && config_dock_hide) {
             ob_main_loop_timeout_remove(ob_main_loop, show_timeout);
         }