diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index d7dc25ee5..35fbfe49b 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -919,43 +919,6 @@ var BaseAppView = GObject.registerClass({ } } - animate(animationDirection, onComplete) { - if (onComplete) { - let animationDoneId = this._grid.connect('animation-done', () => { - this._grid.disconnect(animationDoneId); - onComplete(); - }); - } - - this._clearAnimateLater(); - this._grid.opacity = 255; - - if (animationDirection == IconGrid.AnimationDirection.IN) { - const doSpringAnimationLater = laterType => { - this._animateLaterId = Meta.later_add(laterType, - () => { - this._animateLaterId = 0; - this._doSpringAnimation(animationDirection); - return GLib.SOURCE_REMOVE; - }); - }; - - if (this._viewIsReady) { - this._grid.opacity = 0; - doSpringAnimationLater(Meta.LaterType.IDLE); - } else { - this._viewLoadedHandlerId = this.connect('view-loaded', - () => { - this._clearAnimateLater(); - this._grid.opacity = 255; - doSpringAnimationLater(Meta.LaterType.BEFORE_REDRAW); - }); - } - } else { - this._doSpringAnimation(animationDirection); - } - } - _getDropTarget(x, y, source) { const { currentPage } = this._grid; @@ -1656,24 +1619,6 @@ class AppDisplay extends BaseAppView { return appIcons; } - // Overridden from BaseAppView - animate(animationDirection, onComplete) { - this._scrollView.reactive = false; - this._swipeTracker.enabled = false; - let completionFunc = () => { - this._scrollView.reactive = true; - this._swipeTracker.enabled = this.mapped; - if (onComplete) - onComplete(); - }; - - if (animationDirection == IconGrid.AnimationDirection.OUT && - this._displayingDialog && this._currentDialog) - this._currentDialog.popdown(); - else - super.animate(animationDirection, completionFunc); - } - animateSwitch(animationDirection) { super.animateSwitch(animationDirection); @@ -2277,11 +2222,6 @@ class FolderView extends BaseAppView { return aPosition - bPosition; } - // Overridden from BaseAppView - animate(animationDirection) { - this._grid.animatePulse(animationDirection); - } - createFolderIcon(size) { const layout = new Clutter.GridLayout({ row_homogeneous: true,