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

appDisplay: Disable scrolling during animations

Browse Source 
Currently scroll events during the swarm animation will make the
grid appear immediately in addition to the animating clones, and
there'll be a mismatch with the icon at the target position. This
badly breaks the illusion of launchers emerging from the dash and
positioning themselves in a grid - as scrolling icons "mid-air"
before they form a paginated grid doesn't make much sense anyway,
fix this issue by ignoring scroll events for the duration of the
animation.

https://bugzilla.gnome.org/show_bug.cgi?id=745574
This commit is contained in:
Florian Müllner 2015-03-04 10:29:22 +01:00
parent 99af774c98
commit 6bb905895c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/appDisplay.js
View File

@ -541,6 +541,12 @@ const AllView = new Lang.Class({
// Overriden from BaseAppView
animate: function (animationDirection, onComplete) {
this._scrollView.reactive = false;
let completionFunc = Lang.bind(this, function() {
this._scrollView.reactive = true;
onComplete();
});
if (animationDirection == IconGrid.AnimationDirection.OUT &&
this._displayingPopup && this._currentPopup) {
this._currentPopup.popdown();
@ -551,10 +557,10 @@ const AllView = new Lang.Class({
// signal handler, call again animate which will
// call the parent given that popup is already
// closed.
this.animate(animationDirection, onComplete);
this.animate(animationDirection, completionFunc);
}));
} else {
this.parent(animationDirection, onComplete);
this.parent(animationDirection, completionFunc);
if (animationDirection == IconGrid.AnimationDirection.OUT)
this._pageIndicators.animateIndicators(animationDirection);
}
@ -641,7 +647,7 @@ const AllView = new Lang.Class({
},
_onScroll: function(actor, event) {
if (this._displayingPopup)
if (this._displayingPopup || !this._scrollView.reactive)
return Clutter.EVENT_STOP;
let direction = event.get_scroll_direction();