workspace: don't show WindowOverlay during zoomFromOverview
https://bugzilla.gnome.org/show_bug.cgi?id=641533
This commit is contained in:
parent
475c36048b
commit
aba6a85c56
@ -1051,9 +1051,6 @@ Workspace.prototype = {
|
|||||||
cloneWidth = this.scale * clone.actor.scale_x * cloneWidth;
|
cloneWidth = this.scale * clone.actor.scale_x * cloneWidth;
|
||||||
cloneHeight = this.scale * clone.actor.scale_y * cloneHeight;
|
cloneHeight = this.scale * clone.actor.scale_y * cloneHeight;
|
||||||
|
|
||||||
if (!this._windowOverlaysGroup.visible)
|
|
||||||
this._windowOverlaysGroup.show();
|
|
||||||
|
|
||||||
if (overlay) {
|
if (overlay) {
|
||||||
overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
|
overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
|
||||||
if (fade)
|
if (fade)
|
||||||
@ -1074,13 +1071,6 @@ Workspace.prototype = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_hideAllOverlays: function() {
|
|
||||||
for (let i = 0; i < this._windows.length; i++) {
|
|
||||||
let overlay = this._windowOverlays[i];
|
|
||||||
overlay.hide();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
_delayedWindowRepositioning: function() {
|
_delayedWindowRepositioning: function() {
|
||||||
if (this._windowIsZooming)
|
if (this._windowIsZooming)
|
||||||
return true;
|
return true;
|
||||||
@ -1105,6 +1095,9 @@ Workspace.prototype = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
showWindowsOverlays: function() {
|
showWindowsOverlays: function() {
|
||||||
|
if (this.leavingOverview)
|
||||||
|
return;
|
||||||
|
|
||||||
this._windowOverlaysGroup.show();
|
this._windowOverlaysGroup.show();
|
||||||
this._showAllOverlays();
|
this._showAllOverlays();
|
||||||
},
|
},
|
||||||
@ -1231,7 +1224,7 @@ Workspace.prototype = {
|
|||||||
|
|
||||||
this.leavingOverview = true;
|
this.leavingOverview = true;
|
||||||
|
|
||||||
this._hideAllOverlays();
|
this.hideWindowsOverlays();
|
||||||
|
|
||||||
if (this._repositionWindowsId > 0) {
|
if (this._repositionWindowsId > 0) {
|
||||||
Mainloop.source_remove(this._repositionWindowsId);
|
Mainloop.source_remove(this._repositionWindowsId);
|
||||||
|
@ -634,7 +634,7 @@ WorkspacesView.prototype = {
|
|||||||
let dy = newY - currentY;
|
let dy = newY - currentY;
|
||||||
|
|
||||||
for (let i = 0; i < this._workspaces.length; i++) {
|
for (let i = 0; i < this._workspaces.length; i++) {
|
||||||
this._workspaces[i]._hideAllOverlays();
|
this._workspaces[i].hideWindowsOverlays();
|
||||||
this._workspaces[i].actor.visible = Math.abs(i - adj.value) <= 1;
|
this._workspaces[i].actor.visible = Math.abs(i - adj.value) <= 1;
|
||||||
this._workspaces[i].actor.y += dy;
|
this._workspaces[i].actor.y += dy;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user