attempted fix for issue #75

bbidulock · May 3, 2016 · 2b0df4d · 2b0df4d
1 parent 79c6633
commit 2b0df4d
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/wmstatus.cc b/src/wmstatus.cc
@@ -116,8 +116,13 @@ void MoveSizeStatus::setStatus(YFrameWindow *frame, const YRect &r) {
 
     fX = r.x();
     fY = r.y();
-    fW = (width - (sh ? sh->base_width : 0)) / (sh ? sh->width_inc : 1);
-    fH = (height - (sh ? sh->base_height : 0)) / (sh ? sh->height_inc : 1);
+    if (sh && (sh->flags & PResizeInc)) {
+        fW = (width - sh->base_width) / (sh->width_inc ?: 1);
+        fH = (height - sh->base_height) / (sh->height_inc ?: 1);
+    } else {
+        fW = width;
+        fH = height;
+    }
     repaintSync();
 }
 
@@ -126,8 +131,13 @@ void MoveSizeStatus::setStatus(YFrameWindow *frame) {
 
     fX = frame->x ();//// + frame->borderX ();
     fY = frame->y ();//// + frame->borderY () + frame->titleY ();
-    fW = (frame->client()->width() - (sh ? sh->base_width : 0)) / (sh ? sh->width_inc : 1);
-    fH = (frame->client()->height() - (sh ? sh->base_height : 0)) / (sh ? sh->height_inc : 1);
+    if (sh && (sh->flags & PResizeInc)) {
+        fW = (frame->client()->width() - sh->base_width) / (sh->width_inc ?: 1);
+        fH = (frame->client()->height() - sh->base_height) / (sh->height_inc ?: 1);
+    } else {
+        fW = frame->client()->width();
+        fH = frame->client()->height();
+    }
     repaintSync();
 }