isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

workspaceThumbnail: Use new helper function when accepting drops

Browse Source 
Moving a window from a secondary monitor to a non-active workspace
currently fails for the aforementioned reasons.

Use the newly added helper function to address this.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/893

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2259>
This commit is contained in:
Florian Müllner 2022-03-31 17:15:26 +02:00
parent 88244222fd
commit ff29159df2
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/workspaceThumbnail.js
View File

@ -552,14 +552,8 @@ var WorkspaceThumbnail = GObject.registerClass({
return false; return false;
let metaWindow = win.get_meta_window(); let metaWindow = win.get_meta_window();
Main.moveWindowToMonitorAndWorkspace(metaWindow,
// We need to move the window before changing the workspace, because this.monitorIndex, this.metaWorkspace.index());
// the move itself could cause a workspace change if the window enters
// the primary monitor
if (metaWindow.get_monitor() != this.monitorIndex)
metaWindow.move_to_monitor(this.monitorIndex);
metaWindow.change_workspace_by_index(this.metaWorkspace.index(), false);
return true; return true;
} else if (source.app && source.app.can_open_new_window()) { } else if (source.app && source.app.can_open_new_window()) {
if (source.animateLaunchAtPos) if (source.animateLaunchAtPos)
@ -903,9 +897,8 @@ var ThumbnailsBox = GObject.registerClass({
if (isWindow) { if (isWindow) {
// Move the window to our monitor first if necessary. // Move the window to our monitor first if necessary.
let thumbMonitor = this._thumbnails[newWorkspaceIndex].monitorIndex; let thumbMonitor = this._thumbnails[newWorkspaceIndex].monitorIndex;
if (source.metaWindow.get_monitor() != thumbMonitor) Main.moveWindowToMonitorAndWorkspace(source.metaWindow,
source.metaWindow.move_to_monitor(thumbMonitor); thumbMonitor, newWorkspaceIndex, true);
source.metaWindow.change_workspace_by_index(newWorkspaceIndex, true);
} else if (source.app && source.app.can_open_new_window()) { } else if (source.app && source.app.can_open_new_window()) {
if (source.animateLaunchAtPos) if (source.animateLaunchAtPos)
source.animateLaunchAtPos(actor.x, actor.y); source.animateLaunchAtPos(actor.x, actor.y);