about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Feng <chris.w.feng@gmail.com>2016-06-17T05·30+0800
committerChris Feng <chris.w.feng@gmail.com>2016-06-17T05·30+0800
commit38332925d0d5655e98416afaa7869bbaddb360b8 (patch)
tree598db58a8fdf8e99ac7a0a542853162ed1795600
parent9e754e7e138c8ac969bc69b8ffbe988fbcbe4a3e (diff)
* exwm-layout.el (exwm-layout--show): Resize the X window
if the minibuffer is active but with line height 1.
-rw-r--r--exwm-layout.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/exwm-layout.el b/exwm-layout.el
index 0069767d1a73..0ce1fdcace60 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -60,11 +60,12 @@
     (with-current-buffer (exwm--id->buffer id)
       (if (not exwm--floating-frame)
           (let ((relative-edges (window-inside-pixel-edges window)))
-            (exwm-layout--resize-container id exwm--container
-                                           (elt relative-edges 0)
-                                           (elt relative-edges 1)
-                                           width height
-                                           (active-minibuffer-window)))
+            (exwm-layout--resize-container
+             id exwm--container
+             (elt relative-edges 0) (elt relative-edges 1) width height
+             ;; Do not resize the X window if the minibuffer resizes itself.
+             (and (active-minibuffer-window)
+                  (< 1 (window-height (active-minibuffer-window))))))
         ;; A floating X window is of the same size as the Emacs window,
         ;; whereas its container is of the same size as the Emacs frame.
         (setq frame-width (frame-pixel-width exwm--floating-frame)