From: Dana Jansens <danakj@orodu.net>
Date: Wed, 3 Sep 2003 21:07:46 +0000 (+0000)
Subject: dont set a strut when there are no apps in the dock
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=792d3e7a70ec5f0502d748dc96dc9b13b7c3971f;p=chaz%2Fopenbox

dont set a strut when there are no apps in the dock
---

diff --git a/openbox/dock.c b/openbox/dock.c
index 0bb28d43..1df377b0 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -351,11 +351,14 @@ void dock_configure()
         strh = ob_rr_theme->bwidth;
     } else {
         strw = dock->w;
-        strh =  dock->h;
+        strh = dock->h;
     }
 
     /* set the strut */
-    if (config_dock_floating) {
+    if (!dock->dock_apps) {
+        STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+                          0, 0, 0, 0, 0, 0, 0, 0);
+    } else if (config_dock_floating) {
         STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0);
     } else {
@@ -446,7 +449,10 @@ void dock_configure()
     dock->w -= ob_rr_theme->bwidth * 2;
     dock->h -= ob_rr_theme->bwidth * 2;
 
-    if (dock->w > 0 && dock->h > 0) {
+    if (dock->dock_apps) {
+        g_assert(dock->w > 0);
+        g_assert(dock->h > 0);
+
         XMoveResizeWindow(ob_display, dock->frame,
                           dock->x, dock->y, dock->w, dock->h);