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

workspacesView: Stop using full geometry

Browse Source 
Since the workspaces themselves stopped using it, there is little
reason for upholding the difference between "full" and "actual"
geometry.

Just base positioning/swiping on the view's allocation.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1345
This commit is contained in:
Florian Müllner 2020-06-27 17:25:25 +02:00
parent 5e4b65d37e
commit ff13ad9e71
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/workspacesView.js
View File

@ -164,11 +164,11 @@ class WorkspacesView extends WorkspacesViewBase {
let params = {}; let params = {};
if (workspaceManager.layout_rows == -1) if (workspaceManager.layout_rows == -1)
params.translation_y = (w - active) * this._fullGeometry.height; params.translation_y = (w - active) * this.height;
else if (this.text_direction == Clutter.TextDirection.RTL) else if (this.text_direction == Clutter.TextDirection.RTL)
params.translation_x = (active - w) * this._fullGeometry.width; params.translation_x = (active - w) * this.width;
else else
params.translation_x = (w - active) * this._fullGeometry.width; params.translation_x = (w - active) * this.width;
if (showAnimation) { if (showAnimation) {
let easeParams = Object.assign(params, { let easeParams = Object.assign(params, {
@ -232,8 +232,7 @@ class WorkspacesView extends WorkspacesViewBase {
} }
} }
if (this._fullGeometry) this._updateWorkspaceActors(false);
this._updateWorkspaceActors(false);
} }
_activeWorkspaceChanged(_wm, _from, _to, _direction) { _activeWorkspaceChanged(_wm, _from, _to, _direction) {
@ -534,11 +533,8 @@ class WorkspacesDisplay extends St.Widget {
for (let i = 0; i < this._workspacesViews.length; i++) for (let i = 0; i < this._workspacesViews.length; i++)
this._workspacesViews[i].startTouchGesture(); this._workspacesViews[i].startTouchGesture();
let monitors = Main.layoutManager.monitors;
let geometry = monitor === this._primaryIndex
? this._fullGeometry : monitors[monitor];
let distance = global.workspace_manager.layout_rows === -1 let distance = global.workspace_manager.layout_rows === -1
? geometry.height : geometry.width; ? this.height : this.width;
let progress = adjustment.value / adjustment.page_size; let progress = adjustment.value / adjustment.page_size;
let points = Array.from( let points = Array.from(
@ -585,7 +581,7 @@ class WorkspacesDisplay extends St.Widget {
this.show(); this.show();
this._updateWorkspacesViews(); this._updateWorkspacesViews();
if (this._actualGeometry && this._fullGeometry) { if (this._actualGeometry) {
for (let i = 0; i < this._workspacesViews.length; i++) { for (let i = 0; i < this._workspacesViews.length; i++) {
let animationType; let animationType;
if (fadeOnPrimary && i == this._primaryIndex) if (fadeOnPrimary && i == this._primaryIndex)