From 08f20ea0b9ea961c579720bf0d305c7a9cea650a Mon Sep 17 00:00:00 2001 From: Adrián Medraño Calvo Date: Wed, 10 Nov 2021 00:00:00 +0000 Subject: Fix previous commit "Remove duplicate code" * exwm-layout.el (exwm-layout-unset-fullscreen): `xcb:Atom:_NET_WM_STATE_FULLSCREEN' must be excised before invoking `exwm-layout--show'. --- exwm-layout.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'exwm-layout.el') diff --git a/exwm-layout.el b/exwm-layout.el index 4b6e2a8f66f6..9173a1c049df 100644 --- a/exwm-layout.el +++ b/exwm-layout.el @@ -219,6 +219,11 @@ (exwm-layout--fullscreen-p)) (cl-return-from exwm-layout-unset-fullscreen)) (with-current-buffer (if id (exwm--id->buffer id) (window-buffer)) + ;; `exwm-layout--show' relies on `exwm--ewmh-state' to decide whether to + ;; fullscreen the window. + (setq exwm--ewmh-state + (delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state)) + (exwm-layout--set-ewmh-state exwm--id) (if exwm--floating-frame (exwm-layout--show exwm--id (frame-root-window exwm--floating-frame)) (xcb:+request exwm--connection @@ -231,9 +236,6 @@ (let ((window (get-buffer-window nil t))) (when window (exwm-layout--show exwm--id window)))) - (setq exwm--ewmh-state - (delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state)) - (exwm-layout--set-ewmh-state exwm--id) (xcb:flush exwm--connection) (set-window-dedicated-p (get-buffer-window) nil) (when (eq 'line-mode exwm--selected-input-mode) -- cgit 1.4.1