add PARTIAL_SRUT_EQUAL

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index f14922401c8c040d688cfe1a6a2c873008f92e29..63a7f977e9b105f5faf9b0722821458728a0cc7c 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -39,8 +39,17 @@ void dock_startup(gboolean reconfig)
     XSetWindowAttributes attrib;
 
     if (reconfig) {
+        XSetWindowBorder(ob_display, dock->frame,
+                         RrColorPixel(ob_rr_theme->b_color));
+        XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
+
+        RrAppearanceFree(dock->a_frame);
+        dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+
         stacking_add(DOCK_AS_WINDOW(dock));
+
         dock_configure();
+        dock_hide(TRUE);
         return;
     }
 
@@ -576,7 +585,7 @@ void dock_hide(gboolean hide)
         /* if was hiding, stop it */
         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_timeout,
+        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay,
                                  hide_timeout, NULL, NULL);
     }
 }