From ccc4cce0e0df426f4eccb81479c4a773c488155d Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Sun, 8 Sep 2019 00:00:00 +0000 Subject: Fix floating X window size with menu-bar/tool-bar enabled * exwm-floating.el (exwm-floating--set-floating) exwm-floating--do-moveresize) exwm-layout.el (exwm-layout--show): Take menu-bar/tool-bar into consideration. --- exwm-layout.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'exwm-layout.el') diff --git a/exwm-layout.el b/exwm-layout.el index 9ef516bd06b2..5644dbadc1af 100644 --- a/exwm-layout.el +++ b/exwm-layout.el @@ -102,11 +102,15 @@ (y (pop edges)) (width (- (pop edges) x)) (height (- (pop edges) y)) - frame-x frame-y frame-width frame-height) + geometry frame-x frame-y frame-width frame-height) (with-current-buffer (exwm--id->buffer id) (when exwm--floating-frame (setq frame-width (frame-pixel-width exwm--floating-frame) - frame-height (frame-pixel-height exwm--floating-frame)) + geometry (frame-geometry exwm--floating-frame) + frame-height (+ (frame-pixel-height exwm--floating-frame) + ;; Use `frame-outer-height' in the future. + (or (cddr (assq 'menu-bar-size geometry)) 0) + (or (cddr (assq 'tool-bar-size geometry)) 0))) (when exwm--floating-frame-position (setq frame-x (elt exwm--floating-frame-position 0) frame-y (elt exwm--floating-frame-position 1) -- cgit 1.4.1