[gnome-shell] overview: change _hideInProgress to visibleTarget
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] overview: change _hideInProgress to visibleTarget
- Date: Sat, 16 Feb 2013 18:26:56 +0000 (UTC)
commit 31cdac7bfbd5cd6c07578554ab09cc488b9dde66
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Feb 16 12:45:10 2013 -0500
overview: change _hideInProgress to visibleTarget
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
js/ui/overview.js | 6 +++---
js/ui/overviewControls.js | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/overview.js b/js/ui/overview.js
index f5706f0..afdba1f 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -152,7 +152,7 @@ const Overview = new Lang.Class({
this._shownTemporarily = false; // showTemporarily() and not hideTemporarily()
this._modal = false; // have a modal grab
this.animationInProgress = false;
- this._hideInProgress = false;
+ this.visibleTarget = false;
// 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
@@ -469,6 +469,7 @@ const Overview = new Lang.Class({
this.visible = true;
this.animationInProgress = true;
+ this.visibleTarget = true;
// All the the actors in the window group are completely obscured,
// hiding the group holding them while the Overview is displayed greatly
@@ -606,7 +607,7 @@ const Overview = new Lang.Class({
return;
this.animationInProgress = true;
- this._hideInProgress = true;
+ this.visibleTarget = false;
this._viewSelector.zoomFromOverview();
@@ -658,7 +659,6 @@ const Overview = new Lang.Class({
this.visible = false;
this.animationInProgress = false;
- this._hideInProgress = false;
this._coverPane.hide();
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 37894ed..f0f309e 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -314,7 +314,8 @@ const ControlsManager = new Lang.Class({
// actors will be made visible again when entering the overview
// next time, and animating them while doing so is just
// unnecessary noise
- if (!Main.overview.visible)
+ if (!Main.overview.visible ||
+ (Main.overview.animationInProgress && !Main.overview.visibleTarget))
return;
let activePage = this._viewSelector.getActivePage();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]