X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=1df377b0a07b46b662d29902c7857035af04bfcb;hb=68e8dea93dbdfefb11b1b960abb9da79a2f23c52;hp=0bb28d4356de4e5bc413e0746dff0ccc2b90ed76;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

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);