mirror of
https://github.com/emacs-exwm/exwm.git
synced 2024-11-30 16:07:59 +01:00
Merge branch 'vedvyas/workspace-move-window-tweak' into externals/exwm
This commit is contained in:
commit
4287d31df1
2 changed files with 6 additions and 6 deletions
|
@ -82,8 +82,9 @@ context of the corresponding buffer.")
|
||||||
(defun exwm-floating--set-floating (id)
|
(defun exwm-floating--set-floating (id)
|
||||||
"Make window ID floating."
|
"Make window ID floating."
|
||||||
(let ((window (get-buffer-window (exwm--id->buffer id))))
|
(let ((window (get-buffer-window (exwm--id->buffer id))))
|
||||||
(when window ;window in non-floating state
|
(when window
|
||||||
(set-window-buffer window (other-buffer)))) ;hide it first
|
;; Hide the non-floating X window first.
|
||||||
|
(set-window-buffer window (other-buffer nil t))))
|
||||||
(let* ((original-frame exwm-workspace--current)
|
(let* ((original-frame exwm-workspace--current)
|
||||||
;; Create new frame
|
;; Create new frame
|
||||||
(frame (with-current-buffer
|
(frame (with-current-buffer
|
||||||
|
|
|
@ -746,10 +746,9 @@ INDEX must not exceed the current number of workspaces."
|
||||||
(frame-root-window
|
(frame-root-window
|
||||||
exwm--floating-frame)))))
|
exwm--floating-frame)))))
|
||||||
;; Move the X window container.
|
;; Move the X window container.
|
||||||
(if (eq frame exwm-workspace--current)
|
(set-window-buffer (get-buffer-window (current-buffer) t)
|
||||||
(set-window-buffer (get-buffer-window (current-buffer) t)
|
(other-buffer nil t))
|
||||||
(other-buffer))
|
(unless (eq frame exwm-workspace--current)
|
||||||
(bury-buffer)
|
|
||||||
;; Clear the 'exwm-selected-window' frame parameter.
|
;; Clear the 'exwm-selected-window' frame parameter.
|
||||||
(set-frame-parameter frame 'exwm-selected-window nil))
|
(set-frame-parameter frame 'exwm-selected-window nil))
|
||||||
(exwm-layout--hide id)
|
(exwm-layout--hide id)
|
||||||
|
|
Loading…
Reference in a new issue