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

overview: change _hideInProgress to visibleTarget

Browse Source 
And use it in overviewControls. When we moved this code from overview.js
to overviewControls.js we lost a condition so we now slide in controls
even when going back from the overview, which looks bad.

https://bugzilla.gnome.org/show_bug.cgi?id=693974
This commit is contained in:
Cosimo Cecchi 2013-02-16 12:45:10 -05:00
parent 0705901bce
commit 31cdac7bfb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/overview.js
View File

@ -152,7 +152,7 @@ const Overview = new Lang.Class({
this._shownTemporarily = false; // showTemporarily() and not hideTemporarily() this._shownTemporarily = false; // showTemporarily() and not hideTemporarily()
this._modal = false; // have a modal grab this._modal = false; // have a modal grab
this.animationInProgress = false; this.animationInProgress = false;
this._hideInProgress = false; this.visibleTarget = false;
// During transitions, we raise this to the top to avoid having the overview // During transitions, we raise this to the top to avoid having the overview
// area be reactive; it causes too many issues such as double clicks on // area be reactive; it causes too many issues such as double clicks on
@ -469,6 +469,7 @@ const Overview = new Lang.Class({
this.visible = true; this.visible = true;
this.animationInProgress = true; this.animationInProgress = true;
this.visibleTarget = true;
// All the the actors in the window group are completely obscured, // All the the actors in the window group are completely obscured,
// hiding the group holding them while the Overview is displayed greatly // hiding the group holding them while the Overview is displayed greatly
@ -606,7 +607,7 @@ const Overview = new Lang.Class({
return; return;
this.animationInProgress = true; this.animationInProgress = true;
this._hideInProgress = true; this.visibleTarget = false;
this._viewSelector.zoomFromOverview(); this._viewSelector.zoomFromOverview();
@ -658,7 +659,6 @@ const Overview = new Lang.Class({
this.visible = false; this.visible = false;
this.animationInProgress = false; this.animationInProgress = false;
this._hideInProgress = false;
this._coverPane.hide(); this._coverPane.hide();

3
js/ui/overviewControls.js
View File

@ -314,7 +314,8 @@ const ControlsManager = new Lang.Class({
// actors will be made visible again when entering the overview // actors will be made visible again when entering the overview
// next time, and animating them while doing so is just // next time, and animating them while doing so is just
// unnecessary noise // unnecessary noise
if (!Main.overview.visible) if (!Main.overview.visible ||
(Main.overview.animationInProgress && !Main.overview.visibleTarget))
return; return;
let activePage = this._viewSelector.getActivePage(); let activePage = this._viewSelector.getActivePage();