[gnome-shell/wip/swarm: 25/30] viewSelector: Only animate with swarm on special cases
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/swarm: 25/30] viewSelector: Only animate with swarm on special cases
- Date: Wed, 25 Jun 2014 15:04:43 +0000 (UTC)
commit a1310da2b47337ad056fb35ef0101d1f64621e79
Author: Carlos Soriano <carlos soriano89 gmail com>
Date: Tue Jun 17 20:58:50 2014 +0200
viewSelector: Only animate with swarm on special cases
js/ui/viewSelector.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 79d83f2..9dd8894 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -229,9 +229,12 @@ const ViewSelector = new Lang.Class({
},
_animateIn: function(page, oldPage) {
+ log("_animateIn page " + page);
+ log("_animateIn oldPage " + oldPage);
+
this._activePage.show();
- if (page == this._appsPage) {
+ if (page == this._appsPage && oldPage == this._workspacesPage) {
this.appDisplay.animate(IconGrid.ANIMATION_DIRECTION_IN);
} else {
this._fadePageIn(this._activePage);
@@ -239,7 +242,9 @@ const ViewSelector = new Lang.Class({
},
_animateOut: function(page, newPage, onComplete) {
- if (page == this._appsPage) {
+ log("animeOut page " + page);
+ log("animeOut newPage " + newPage);
+ if (page == this._appsPage && newPage == this._workspacesPage) {
this.appDisplay.animate(IconGrid.ANIMATION_DIRECTION_OUT,
onComplete);
} else {
@@ -264,11 +269,11 @@ const ViewSelector = new Lang.Class({
let animateActivePage = Lang.bind(this,
function() {
this._hidePageAndSyncEmpty(oldPage);
- this._animateIn(this._activePage, oldPage);
+ this._animateIn(page, oldPage);
});
if (oldPage && animateOut)
- this._animateOut(oldPage, newPage, animateActivePage)
+ this._animateOut(oldPage, page, animateActivePage)
else
animateActivePage();
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]