about summary refs log tree commit diff
path: root/exwm-workspace.el
diff options
context:
space:
mode:
Diffstat (limited to 'exwm-workspace.el')
-rw-r--r--exwm-workspace.el28
1 files changed, 16 insertions, 12 deletions
diff --git a/exwm-workspace.el b/exwm-workspace.el
index d57505870a62..551ccbfba98d 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -232,32 +232,36 @@ Value nil means to use the default position which is fixed at bottom, while
           (`left
            (setq delta (- (aref w 0) width))
            (when (and (< delta 0)
-                      (< (max (aref position 0) (aref w 1))
-                         (min (aref position 1)
-                              (+ (aref w 1) (aref w 3)))))
+                      (or (not position)
+                          (< (max (aref position 0) (aref w 1))
+                             (min (aref position 1)
+                                  (+ (aref w 1) (aref w 3))))))
              (cl-incf (aref w 2) delta)
              (setf (aref w 0) width)))
           (`right
            (setq delta (- root-width (aref w 0) (aref w 2) width))
            (when (and (< delta 0)
-                      (< (max (aref position 0) (aref w 1))
-                         (min (aref position 1)
-                              (+ (aref w 1) (aref w 3)))))
+                      (or (not position)
+                          (< (max (aref position 0) (aref w 1))
+                             (min (aref position 1)
+                                  (+ (aref w 1) (aref w 3))))))
              (cl-incf (aref w 2) delta)))
           (`top
            (setq delta (- (aref w 1) width))
            (when (and (< delta 0)
-                      (< (max (aref position 0) (aref w 0))
-                         (min (aref position 1)
-                              (+ (aref w 0) (aref w 2)))))
+                      (or (not position)
+                          (< (max (aref position 0) (aref w 0))
+                             (min (aref position 1)
+                                  (+ (aref w 0) (aref w 2))))))
              (cl-incf (aref w 3) delta)
              (setf (aref w 1) width)))
           (`bottom
            (setq delta (- root-height (aref w 1) (aref w 3) width))
            (when (and (< delta 0)
-                      (< (max (aref position 0) (aref w 0))
-                         (min (aref position 1)
-                              (+ (aref w 0) (aref w 2)))))
+                      (or (not position)
+                          (< (max (aref position 0) (aref w 0))
+                             (min (aref position 1)
+                                  (+ (aref w 0) (aref w 2))))))
              (cl-incf (aref w 3) delta))))))
     ;; Save the result.
     (setq exwm-workspace--workareas workareas)