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

workspaceThumbnails: Update indicator on workspace changes

Browse Source 
We block state updates while the indicator for the active workspace
is animating. To track that, we check whether the scroll-adjustment's
value matches the active workspace index. That works as long as the
adjustment's value changes after the active workspace, but not when
switching workspaces via SwipeTracker which only changes the active
workspace after transitioning to the new scroll value.

To fix that, update the indicator on workspace changes as well.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1716>
This commit is contained in:
Florian Müllner 2021-03-02 19:48:55 +01:00 committed by Marge Bot
parent fac50fb50e
commit 30f0c9f943
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/ui/workspaceThumbnail.js
View File

@ -706,24 +706,13 @@ var ThumbnailsBox = GObject.registerClass({
}); });
this.connect('destroy', () => this._onDestroy()); this.connect('destroy', () => this._onDestroy());
this._switchWorkspaceNotifyId = 0;
this._nWorkspacesNotifyId = 0; this._nWorkspacesNotifyId = 0;
this._activeWorkspaceChangedId = 0;
this._syncStackingId = 0; this._syncStackingId = 0;
this._scrollAdjustment = scrollAdjustment; this._scrollAdjustment = scrollAdjustment;
this._scrollValueId = this._scrollAdjustment.connect('notify::value', this._scrollValueId = this._scrollAdjustment.connect('notify::value',
adj => { () => this._updateIndicator());
const { workspaceManager } = global;
const activeIndex = workspaceManager.get_active_workspace_index();
this._animatingIndicator = adj.value !== activeIndex;
if (!this._animatingIndicator)
this._queueUpdateStates();
this.queue_relayout();
});
} }
_onDestroy() { _onDestroy() {
@ -762,6 +751,19 @@ var ThumbnailsBox = GObject.registerClass({
this.notify('should-show'); this.notify('should-show');
} }
_updateIndicator() {
const { value } = this._scrollAdjustment;
const { workspaceManager } = global;
const activeIndex = workspaceManager.get_active_workspace_index();
this._animatingIndicator = value !== activeIndex;
if (!this._animatingIndicator)
this._queueUpdateStates();
this.queue_relayout();
}
_activateThumbnailAtPoint(stageX, stageY, time) { _activateThumbnailAtPoint(stageX, stageY, time) {
const [r_, x] = this.transform_stage_point(stageX, stageY); const [r_, x] = this.transform_stage_point(stageX, stageY);
@ -992,6 +994,9 @@ var ThumbnailsBox = GObject.registerClass({
this._nWorkspacesNotifyId = this._nWorkspacesNotifyId =
workspaceManager.connect('notify::n-workspaces', workspaceManager.connect('notify::n-workspaces',
this._workspacesChanged.bind(this)); this._workspacesChanged.bind(this));
this._activeWorkspaceChangedId =
workspaceManager.connect('active-workspace-changed',
() => this._updateIndicator());
this._workspacesReorderedId = this._workspacesReorderedId =
workspaceManager.connect('workspaces-reordered', () => { workspaceManager.connect('workspaces-reordered', () => {
this._thumbnails.sort((a, b) => { this._thumbnails.sort((a, b) => {
@ -1019,13 +1024,17 @@ var ThumbnailsBox = GObject.registerClass({
if (this._thumbnails.length == 0) if (this._thumbnails.length == 0)
return; return;
const { workspaceManager } = global;
if (this._nWorkspacesNotifyId > 0) { if (this._nWorkspacesNotifyId > 0) {
let workspaceManager = global.workspace_manager;
workspaceManager.disconnect(this._nWorkspacesNotifyId); workspaceManager.disconnect(this._nWorkspacesNotifyId);
this._nWorkspacesNotifyId = 0; this._nWorkspacesNotifyId = 0;
} }
if (this._activeWorkspaceChangedId > 0) {
workspaceManager.disconnect(this._activeWorkspaceChangedId);
this._activeWorkspaceChangedId = 0;
}
if (this._workspacesReorderedId > 0) { if (this._workspacesReorderedId > 0) {
let workspaceManager = global.workspace_manager;
workspaceManager.disconnect(this._workspacesReorderedId); workspaceManager.disconnect(this._workspacesReorderedId);
this._workspacesReorderedId = 0; this._workspacesReorderedId = 0;
} }