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

workspace: Remove reserved slots

Browse Source 
This is a pre-3.0 feature that was dropped before
the 3.0 release, but managed to find its way until
now, 11 years later.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1352
This commit is contained in:
Georges Basile Stavracas Neto 2020-06-02 21:22:40 -03:00 committed by Florian Müllner
parent 03bcd4c05b
commit fa97f7141b
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/workspace.js
View File

@ -820,9 +820,6 @@ class Workspace extends St.Widget {
layout_manager: new WorkspaceLayout(metaWorkspace, monitorIndex), layout_manager: new WorkspaceLayout(metaWorkspace, monitorIndex),
}); });
// When dragging a window, we use this slot for reserve space.
this._reservedSlot = null;
this._reservedSlotWindow = null;
this.metaWorkspace = metaWorkspace; this.metaWorkspace = metaWorkspace;
this.monitorIndex = monitorIndex; this.monitorIndex = monitorIndex;
@ -878,19 +875,6 @@ class Workspace extends St.Widget {
return this._windows.length == 0; return this._windows.length == 0;
} }
setReservedSlot(metaWindow) {
if (this._reservedSlotWindow == metaWindow)
return;
if (!metaWindow || this.containsMetaWindow(metaWindow)) {
this._reservedSlotWindow = null;
this._reservedSlot = null;
} else {
this._reservedSlotWindow = metaWindow;
this._reservedSlot = this._windows[this._lookupIndex(metaWindow)];
}
}
syncStacking(stackIndices) { syncStacking(stackIndices) {
this.layout_manager.syncStacking(stackIndices); this.layout_manager.syncStacking(stackIndices);
} }

13
js/ui/workspacesView.js
View File

@ -52,14 +52,12 @@ var WorkspacesViewBase = GObject.registerClass({
} }
} }
_dragBegin(overview, window) { _dragBegin() {
this._inDrag = true; this._inDrag = true;
this._setReservedSlot(window);
} }
_dragEnd() { _dragEnd() {
this._inDrag = false; this._inDrag = false;
this._setReservedSlot(null);
} }
vfunc_allocate(box) { vfunc_allocate(box) {
@ -132,11 +130,6 @@ class WorkspacesView extends WorkspacesViewBase {
this._updateScrollPosition(); this._updateScrollPosition();
} }
_setReservedSlot(window) {
for (let i = 0; i < this._workspaces.length; i++)
this._workspaces[i].setReservedSlot(window);
}
getActiveWorkspace() { getActiveWorkspace() {
let workspaceManager = global.workspace_manager; let workspaceManager = global.workspace_manager;
let active = workspaceManager.get_active_workspace_index(); let active = workspaceManager.get_active_workspace_index();
@ -311,10 +304,6 @@ class ExtraWorkspaceView extends WorkspacesViewBase {
this.add_actor(this._workspace); this.add_actor(this._workspace);
} }
_setReservedSlot(window) {
this._workspace.setReservedSlot(window);
}
getActiveWorkspace() { getActiveWorkspace() {
return this._workspace; return this._workspace;
} }