X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fdock.c;h=fe9a0f507eba33d255eff0f7f41228b93fc601af;hb=38370b2e82c20acc1a42a03e1e26bdc018a0b9e5;hp=7511366ddc81a999bbdd5897e19220b25837485f;hpb=7eddc48043272f170bfb44b39dc6c99eb4d9dfa5;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 7511366d..fe9a0f50 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   dock.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "debug.h"
 #include "dock.h"
 #include "mainloop.h"
@@ -21,7 +39,15 @@ 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();
         return;
     }
@@ -550,8 +576,6 @@ static gboolean hide_timeout(gpointer data)
 
 void dock_hide(gboolean hide)
 {
-    if (dock->hidden == hide || !config_dock_hide)
-        return;
     if (!hide) {
         /* show */
         dock->hidden = FALSE;
@@ -559,8 +583,8 @@ void dock_hide(gboolean hide)
 
         /* if was hiding, stop it */
         ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
-    } else {
-        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout * 1000,
+    } else if (!dock->hidden && config_dock_hide) {
+        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout,
                                  hide_timeout, NULL, NULL);
     }
 }