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

workspaceAnimation: Group sticky windows and moving window

Browse Source 
Since the transitions consists of window clones now, all the clones appear
above sticky windows. Clone sticky windows as well, and treat them same as
moving window instead.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1326>
This commit is contained in:
Alexander Mikhaylenko 2020-06-20 23:44:24 +05:00 committed by Marge Bot
parent ee5564015a
commit 8eba759932
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/ui/workspaceAnimation.js
View File

@ -37,6 +37,11 @@ class WorkspaceGroup extends Clutter.Actor {
const isSticky = const isSticky =
window.is_on_all_workspaces() || window === this._movingWindow; window.is_on_all_workspaces() || window === this._movingWindow;
// No workspace means we should show windows that are on all workspaces
if (!this._workspace)
return isSticky;
// Otherwise only show windows that are (only) on that workspace
return !isSticky && window.located_on_workspace(this._workspace); return !isSticky && window.located_on_workspace(this._workspace);
} }
@ -155,8 +160,7 @@ var WorkspaceAnimationController = class {
const switchData = {}; const switchData = {};
this._switchData = switchData; this._switchData = switchData;
switchData.movingWindowBin = new Clutter.Actor(); switchData.stickyGroup = new WorkspaceGroup(null, this.movingWindow);
switchData.movingWindow = null;
switchData.workspaceGroups = []; switchData.workspaceGroups = [];
switchData.gestureActivated = false; switchData.gestureActivated = false;
switchData.inProgress = false; switchData.inProgress = false;
@ -169,7 +173,7 @@ var WorkspaceAnimationController = class {
Main.uiGroup.insert_child_above(switchData.backgroundGroup, global.window_group); Main.uiGroup.insert_child_above(switchData.backgroundGroup, global.window_group);
Main.uiGroup.insert_child_above(switchData.container, switchData.backgroundGroup); Main.uiGroup.insert_child_above(switchData.container, switchData.backgroundGroup);
Main.uiGroup.insert_child_above(switchData.movingWindowBin, switchData.container); Main.uiGroup.insert_child_above(switchData.stickyGroup, switchData.container);
let x = 0; let x = 0;
let y = 0; let y = 0;
@ -208,38 +212,14 @@ var WorkspaceAnimationController = class {
switchData.container.y = -activeGroup.y; switchData.container.y = -activeGroup.y;
else else
switchData.container.x = -activeGroup.x; switchData.container.x = -activeGroup.x;
if (this.movingWindow) {
const windowActor = this.movingWindow.get_compositor_private();
switchData.movingWindow = {
windowActor,
parent: windowActor.get_parent(),
};
switchData.movingWindow.parent.remove_child(windowActor);
switchData.movingWindowBin.add_child(windowActor);
switchData.movingWindow.windowDestroyId = windowActor.connect('destroy', () => {
switchData.movingWindow = null;
});
}
} }
_finishWorkspaceSwitch(switchData) { _finishWorkspaceSwitch(switchData) {
this._switchData = null; this._switchData = null;
if (switchData.movingWindow) {
const record = switchData.movingWindow;
record.windowActor.disconnect(record.windowDestroyId);
switchData.movingWindowBin.remove_child(record.windowActor);
record.parent.add_child(record.windowActor);
switchData.movingWindow = null;
}
switchData.backgroundGroup.destroy(); switchData.backgroundGroup.destroy();
switchData.container.destroy(); switchData.container.destroy();
switchData.movingWindowBin.destroy(); switchData.stickyGroup.destroy();
this.movingWindow = null; this.movingWindow = null;
} }