Adapt to Mutter background changes

The rewrite of Mutter's background code (see bug 735637) requires
corresponding changes here - we no longer need to layer multiple
MetaBackgroundActors together.

The general strategy is that a BackgroundSource object is created
per GSettings schema, and keeps either one Background/MetaBackground pair,
or, for animation, a Background/Metabackground pair for each monitor.

https://bugzilla.gnome.org/show_bug.cgi?id=735638

NEWS

@@ -1,24 +1,3 @@
-3.13.91
-=======
-* Fix keynav into session menu on login screen [Florian; #735614]
-* Add gesture to summon message tray [Carlos G.; #735625]
-* Accept scrolls/swipes either way on the screen shield [Jasper; #734874]
-* Animate opening the app picker and improve app folder animations
-  [Carlos S.; #734726]
-* Animate app icons on launching a new window [Carlos S., Florian; #734726]
-* Show the on-screen keyboard when touch input is being used [David; #702015]
-* Misc. bug fixes [Bastien, Owen, Florian, Carlos G.; #735190, #735385,
-  #735608, #735681]
-
-Contributors:
-  Carlos Garnacho, David King, Kalev Lember, Florian Müllner, Bastien Nocera,
-  Carlos Soriano, Jasper St. Pierre, Owen W. Taylor
-
-Translations:
-  Fran Diéguez [gl], Sweta Kothari [gu], Manoj Kumar Giri [or],
-  Alain Lojewski [fr], Praveen Illa [te], Arash Mousavi [fa],
-  Andika Triwidada [id]
-
 3.13.90
 =======
 * Make use of GLSL optional [Adel; #733623]

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.13.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.13.90],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.13.91
+MUTTER_MIN_VERSION=3.13.90
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3

data/theme/gnome-shell.css

@@ -1159,7 +1159,6 @@ StScrollBar StButton#vhandle:active {
 .show-apps:checked > .overview-icon,
 .show-apps:active > .overview-icon,
 .search-provider-icon:active,
-.grid-search-result:active .overview-icon,
 .list-search-result:active {
     background-gradient-start: rgba(255, 255, 255, .05);
     background-gradient-end: rgba(255, 255, 255, .15);

js/js-resources.gresource.xml

@@ -42,7 +42,6 @@
     <file>ui/dash.js</file>
     <file>ui/dateMenu.js</file>
     <file>ui/dnd.js</file>
-    <file>ui/edgeDragAction.js</file>
     <file>ui/endSessionDialog.js</file>
     <file>ui/environment.js</file>
     <file>ui/extensionDownloader.js</file>
@@ -90,7 +89,6 @@
     <file>ui/windowAttentionHandler.js</file>
     <file>ui/windowMenu.js</file>
     <file>ui/windowManager.js</file>
-    <file>ui/wobbly.js</file>
     <file>ui/workspace.js</file>
     <file>ui/workspaceSwitcherPopup.js</file>
     <file>ui/workspaceThumbnail.js</file>

js/ui/appDisplay.js

@@ -34,9 +34,7 @@ const MIN_COLUMNS = 4;
 const MIN_ROWS = 4;
 
 const INACTIVE_GRID_OPACITY = 77;
-// This time needs to be less than IconGrid.EXTRA_SPACE_ANIMATION_TIME
-// to not clash with other animations
-const INACTIVE_GRID_OPACITY_ANIMATION_TIME = 0.24;
+const INACTIVE_GRID_OPACITY_ANIMATION_TIME = 0.40;
 const FOLDER_SUBICON_FRACTION = .4;
 
 const MIN_FREQUENT_APPS_COUNT = 3;
@@ -45,16 +43,6 @@ const INDICATORS_BASE_TIME = 0.25;
 const INDICATORS_ANIMATION_DELAY = 0.125;
 const INDICATORS_ANIMATION_MAX_TIME = 0.75;
 
-// Follow iconGrid animations approach and divide by 2 to animate out to
-// not annoy the user when the user wants to quit appDisplay.
-// Also, make sure we don't exceed iconGrid animation total time or
-// views switch time.
-const INDICATORS_BASE_TIME_OUT = 0.125;
-const INDICATORS_ANIMATION_DELAY_OUT = 0.0625;
-const INDICATORS_ANIMATION_MAX_TIME_OUT =
-    Math.min (VIEWS_SWITCH_TIME,
-              IconGrid.ANIMATION_TIME_OUT + IconGrid.ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
-
 const PAGE_SWITCH_TIME = 0.3;
 
 const VIEWS_SWITCH_TIME = 0.4;
@@ -189,57 +177,6 @@ const BaseAppView = new Lang.Class({
                 this.selectApp(id);
             }));
         }
-    },
-
-    _doSpringAnimation: function(animationDirection) {
-        this._grid.actor.opacity = 255;
-        this._grid.animateSpring(animationDirection,
-                                 Main.overview.getShowAppsButton());
-    },
-
-    animate: function(animationDirection, onComplete) {
-        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            let toAnimate = this._grid.actor.connect('notify::allocation', Lang.bind(this,
-                function() {
-                    this._grid.actor.disconnect(toAnimate);
-                    // We need to hide the grid temporary to not flash it
-                    // for a frame
-                    this._grid.actor.opacity = 0;
-                    Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                                   Lang.bind(this, function() {
-                                       this._doSpringAnimation(animationDirection)
-                                  }));
-                }));
-        } else {
-            this._doSpringAnimation(animationDirection);
-        }
-
-        if (onComplete) {
-            let animationDoneId = this._grid.connect('animation-done', Lang.bind(this,
-                function () {
-                    this._grid.disconnect(animationDoneId);
-                    onComplete();
-            }));
-        }
-    },
-
-    animateSwitch: function(animationDirection) {
-        Tweener.removeTweens(this.actor);
-        Tweener.removeTweens(this._grid.actor);
-
-        let params = { time: VIEWS_SWITCH_TIME,
-                       transition: 'easeOutQuad' };
-        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            this.actor.show();
-            params.opacity = 255;
-            params.delay = VIEWS_SWITCH_ANIMATION_DELAY;
-        } else {
-            params.opacity = 0;
-            params.delay = 0;
-            params.onComplete = Lang.bind(this, function() { this.actor.hide() });
-        }
-
-        Tweener.addTween(this._grid.actor, params);
     }
 });
 Signals.addSignalMethods(BaseAppView.prototype);
@@ -277,10 +214,7 @@ const PageIndicators = new Lang.Class({
         this._currentPage = undefined;
 
         this.actor.connect('notify::mapped',
-                           Lang.bind(this, function() {
-                               this.animateIndicators(IconGrid.AnimationDirection.IN);
-                           })
-                          );
+                           Lang.bind(this, this._animateIndicators));
     },
 
     setNPages: function(nPages) {
@@ -321,7 +255,7 @@ const PageIndicators = new Lang.Class({
             children[i].set_checked(i == this._currentPage);
     },
 
-    animateIndicators: function(animationDirection) {
+    _animateIndicators: function() {
         if (!this.actor.mapped)
             return;
 
@@ -329,32 +263,24 @@ const PageIndicators = new Lang.Class({
         if (children.length == 0)
             return;
 
-        for (let i = 0; i < this._nPages; i++)
-            Tweener.removeTweens(children[i]);
-
         let offset;
         if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
             offset = -children[0].width;
         else
             offset = children[0].width;
 
-        let isAnimationIn = animationDirection == IconGrid.AnimationDirection.IN;
-        let delay = isAnimationIn ? INDICATORS_ANIMATION_DELAY :
-                                    INDICATORS_ANIMATION_DELAY_OUT;
-        let baseTime = isAnimationIn ? INDICATORS_BASE_TIME : INDICATORS_BASE_TIME_OUT;
-        let totalAnimationTime = baseTime + delay * this._nPages;
-        let maxTime = isAnimationIn ? INDICATORS_ANIMATION_MAX_TIME :
-                                      INDICATORS_ANIMATION_MAX_TIME_OUT;
-        if (totalAnimationTime > maxTime)
-            delay -= (totalAnimationTime - maxTime) / this._nPages;
+        let delay = INDICATORS_ANIMATION_DELAY;
+        let totalAnimationTime = INDICATORS_BASE_TIME + INDICATORS_ANIMATION_DELAY * this._nPages;
+        if (totalAnimationTime > INDICATORS_ANIMATION_MAX_TIME)
+            delay -= (totalAnimationTime - INDICATORS_ANIMATION_MAX_TIME) / this._nPages;
 
         for (let i = 0; i < this._nPages; i++) {
-            children[i].translation_x = isAnimationIn ? offset : 0;
+            children[i].translation_x = offset;
             Tweener.addTween(children[i],
-                             { translation_x: isAnimationIn ? 0 : offset,
-                               time: baseTime + delay * i,
+                             { translation_x: 0,
+                               time: INDICATORS_BASE_TIME + delay * i,
                                transition: 'easeInOutQuad',
-                               delay: isAnimationIn ? VIEWS_SWITCH_ANIMATION_DELAY : 0
+                               delay: VIEWS_SWITCH_ANIMATION_DELAY
                              });
         }
     }
@@ -397,7 +323,7 @@ const AllView = new Lang.Class({
         this._stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
         let box = new St.BoxLayout({ vertical: true });
 
-        this._grid.currentPage = 0;
+        this._currentPage = 0;
         this._stack.add_actor(this._grid.actor);
         this._eventBlocker = new St.Widget({ x_expand: true, y_expand: true });
         this._stack.add_actor(this._eventBlocker);
@@ -529,52 +455,14 @@ const AllView = new Lang.Class({
         this._refilterApps();
     },
 
-    // Overriden from BaseAppView
-    animate: function (animationDirection, onComplete) {
-        if (animationDirection == IconGrid.AnimationDirection.OUT &&
-            this._displayingPopup && this._currentPopup) {
-            this._currentPopup.popdown();
-            let spaceClosedId = this._grid.connect('space-closed', Lang.bind(this,
-                function() {
-                    this._grid.disconnect(spaceClosedId);
-                    // Given that we can't call this.parent() inside the
-                    // signal handler, call again animate which will
-                    // call the parent given that popup is already
-                    // closed.
-                    this.animate(animationDirection, onComplete);
-                }));
-        } else {
-            this.parent(animationDirection, onComplete);
-            if (animationDirection == IconGrid.AnimationDirection.OUT)
-                this._pageIndicators.animateIndicators(animationDirection);
-        }
-    },
-
-    animateSwitch: function(animationDirection) {
-        this.parent(animationDirection);
-
-        if (this._currentPopup && this._displayingPopup &&
-            animationDirection == IconGrid.AnimationDirection.OUT)
-            Tweener.addTween(this._currentPopup.actor,
-                             { time: VIEWS_SWITCH_TIME,
-                               transition: 'easeOutQuad',
-                               opacity: 0,
-                               onComplete: function() {
-                                  this.opacity = 255;
-                               } });
-
-        if (animationDirection == IconGrid.AnimationDirection.OUT)
-            this._pageIndicators.animateIndicators(animationDirection);
-    },
-
     getCurrentPageY: function() {
-        return this._grid.getPageY(this._grid.currentPage);
+        return this._grid.getPageY(this._currentPage);
     },
 
     goToPage: function(pageNumber) {
         pageNumber = clamp(pageNumber, 0, this._grid.nPages() - 1);
 
-        if (this._grid.currentPage == pageNumber && this._displayingPopup && this._currentPopup)
+        if (this._currentPage == pageNumber && this._displayingPopup && this._currentPopup)
             return;
         if (this._displayingPopup && this._currentPopup)
             this._currentPopup.popdown();
@@ -594,7 +482,7 @@ const AllView = new Lang.Class({
         let time;
         // Only take the velocity into account on page changes, otherwise
         // return smoothly to the current page using the default velocity
-        if (this._grid.currentPage != pageNumber) {
+        if (this._currentPage != pageNumber) {
             let minVelocity = totalHeight / (PAGE_SWITCH_TIME * 1000);
             velocity = Math.max(minVelocity, velocity);
             time = (diffToPage / velocity) / 1000;
@@ -605,9 +493,9 @@ const AllView = new Lang.Class({
         // longer than PAGE_SWITCH_TIME
         time = Math.min(time, PAGE_SWITCH_TIME);
 
-        this._grid.currentPage = pageNumber;
+        this._currentPage = pageNumber;
         Tweener.addTween(this._adjustment,
-                         { value: this._grid.getPageY(this._grid.currentPage),
+                         { value: this._grid.getPageY(this._currentPage),
                            time: time,
                            transition: 'easeOutQuad' });
         this._pageIndicators.setCurrentPage(pageNumber);
@@ -636,9 +524,9 @@ const AllView = new Lang.Class({
 
         let direction = event.get_scroll_direction();
         if (direction == Clutter.ScrollDirection.UP)
-            this.goToPage(this._grid.currentPage - 1);
+            this.goToPage(this._currentPage - 1);
         else if (direction == Clutter.ScrollDirection.DOWN)
-            this.goToPage(this._grid.currentPage + 1);
+            this.goToPage(this._currentPage + 1);
 
         return Clutter.EVENT_STOP;
     },
@@ -678,10 +566,10 @@ const AllView = new Lang.Class({
             return Clutter.EVENT_STOP;
 
         if (event.get_key_symbol() == Clutter.Page_Up) {
-            this.goToPage(this._grid.currentPage - 1);
+            this.goToPage(this._currentPage - 1);
             return Clutter.EVENT_STOP;
         } else if (event.get_key_symbol() == Clutter.Page_Down) {
-            this.goToPage(this._grid.currentPage + 1);
+            this.goToPage(this._currentPage + 1);
             return Clutter.EVENT_STOP;
         }
 
@@ -742,7 +630,7 @@ const AllView = new Lang.Class({
 
         if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
             this._adjustment.value = 0;
-            this._grid.currentPage = 0;
+            this._currentPage = 0;
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
                 function() {
                     this._pageIndicators.setNPages(this._grid.nPages());
@@ -904,19 +792,6 @@ const AppDisplay = new Lang.Class({
         let layout = new ControlsBoxLayout({ homogeneous: true });
         this._controls = new St.Widget({ style_class: 'app-view-controls',
                                          layout_manager: layout });
-        this._controls.connect('notify::mapped', Lang.bind(this,
-            function() {
-                // controls are faded either with their parent or
-                // explicitly in animate(); we can't know how they'll be
-                // shown next, so make sure to restore their opacity
-                // when they are hidden
-                if (this._controls.mapped)
-                  return;
-
-                Tweener.removeTweens(this._controls);
-                this._controls.opacity = 255;
-            }));
-
         layout.hookup_style(this._controls);
         this.actor.add_actor(new St.Bin({ child: this._controls }));
 
@@ -940,39 +815,23 @@ const AppDisplay = new Lang.Class({
         this._updateFrequentVisibility();
     },
 
-    animate: function(animationDirection, onComplete) {
-        let currentView = this._views[global.settings.get_uint('app-picker-view')].view;
-
-        // Animate controls opacity using iconGrid animation time, since
-        // it will be the time the AllView or FrequentView takes to show
-        // it entirely.
-        let finalOpacity;
-        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            this._controls.opacity = 0;
-            finalOpacity = 255;
-        } else {
-            finalOpacity = 0
-        }
-
-        Tweener.addTween(this._controls,
-                         { time: IconGrid.ANIMATION_TIME_IN,
-                           transition: 'easeInOutQuad',
-                           opacity: finalOpacity,
-                          });
-
-        currentView.animate(animationDirection, onComplete);
-    },
-
     _showView: function(activeIndex) {
         for (let i = 0; i < this._views.length; i++) {
+            let actor = this._views[i].view.actor;
+
+            let params = { time: VIEWS_SWITCH_TIME,
+                           opacity: (i == activeIndex) ? 255 : 0,
+                           delay: (i == activeIndex) ? VIEWS_SWITCH_ANIMATION_DELAY : 0 };
+            if (i == activeIndex)
+                actor.visible = true;
+            else
+                params.onComplete = function() { actor.hide(); };
+            Tweener.addTween(actor, params);
+
             if (i == activeIndex)
                 this._views[i].control.add_style_pseudo_class('checked');
             else
                 this._views[i].control.remove_style_pseudo_class('checked');
-
-            let animationDirection = i == activeIndex ? IconGrid.AnimationDirection.IN :
-                                                        IconGrid.AnimationDirection.OUT;
-            this._views[i].view.animateSwitch(animationDirection);
         }
     },
 
@@ -1054,6 +913,26 @@ const AppSearchProvider = new Lang.Class({
         this.getInitialResultSet(terms, callback, cancellable);
     },
 
+    activateResult: function(result) {
+        let app = this._appSys.lookup_app(result);
+        let event = Clutter.get_current_event();
+        let modifiers = event ? event.get_state() : 0;
+        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
+
+        if (openNewWindow)
+            app.open_new_window(-1);
+        else
+            app.activate();
+    },
+
+    dragActivateResult: function(id, params) {
+        params = Params.parse(params, { workspace: -1,
+                                        timestamp: 0 });
+
+        let app = this._appSys.lookup_app(id);
+        app.open_new_window(workspace);
+    },
+
     createResultObject: function (resultMeta) {
         let app = this._appSys.lookup_app(resultMeta['id']);
         return new AppIcon(app);
@@ -1085,11 +964,6 @@ const FolderView = new Lang.Class({
         Util.ensureActorVisibleInScrollView(this.actor, actor);
     },
 
-    // Overriden from BaseAppView
-    animate: function(animationDirection) {
-        this._grid.animatePulse(animationDirection);
-    },
-
     createFolderIcon: function(size) {
         let layout = new Clutter.GridLayout();
         let icon = new St.Widget({ layout_manager: layout,
@@ -1465,17 +1339,8 @@ const AppFolderPopup = new Lang.Class({
         this.actor.show();
 
         this._boxPointer.setArrowActor(this._source.actor);
-        // We need to hide the icons of the view until the boxpointer animation
-        // is completed so we can animate the icons after as we like without
-        // showing them while boxpointer is animating.
-        this._view.actor.opacity = 0;
         this._boxPointer.show(BoxPointer.PopupAnimation.FADE |
-                              BoxPointer.PopupAnimation.SLIDE,
-                              Lang.bind(this,
-            function() {
-                this._view.actor.opacity = 255;
-                this._view.animate(IconGrid.AnimationDirection.IN);
-            }));
+                              BoxPointer.PopupAnimation.SLIDE);
 
         this.emit('open-state-changed', true);
     },
@@ -1630,7 +1495,13 @@ const AppIcon = new Lang.Class({
 
     _onClicked: function(actor, button) {
         this._removeMenuTimeout();
-        this.activate(button);
+
+        if (button == 0 || button == 1) {
+            this._onActivate(Clutter.get_current_event());
+        } else if (button == 2) {
+            this.app.open_new_window(-1);
+            Main.overview.hide();
+        }
     },
 
     _onKeyboardPopupMenu: function() {
@@ -1684,28 +1555,19 @@ const AppIcon = new Lang.Class({
         this.emit('menu-state-changed', false);
     },
 
-    activate: function (button) {
-        let event = Clutter.get_current_event();
-        let modifiers = event ? event.get_state() : 0;
-        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK &&
-                            this.app.state == Shell.AppState.RUNNING ||
-                            button && button == 2;
+    _onActivate: function (event) {
+        let modifiers = event.get_state();
 
-        if (this.app.state == Shell.AppState.STOPPED || openNewWindow)
-            this.animateLaunch();
-
-        if (openNewWindow)
+        if (modifiers & Clutter.ModifierType.CONTROL_MASK
+            && this.app.state == Shell.AppState.RUNNING) {
             this.app.open_new_window(-1);
-        else
+        } else {
             this.app.activate();
+        }
 
         Main.overview.hide();
     },
 
-    animateLaunch: function() {
-        this.icon.animateZoomOut();
-    },
-
     shellWorkspaceLaunch : function(params) {
         params = Params.parse(params, { workspace: -1,
                                         timestamp: 0 });
@@ -1787,9 +1649,6 @@ const AppIconMenu = new Lang.Class({
             if (this._source.app.can_open_new_window()) {
                 this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
                 this._newWindowMenuItem.connect('activate', Lang.bind(this, function() {
-                    if (this._source.app.state == Shell.AppState.STOPPED)
-                        this._source.animateLaunch();
-
                     this._source.app.open_new_window(-1);
                     this.emit('activate-window', null);
                 }));

js/ui/appFavorites.js

@@ -15,7 +15,6 @@ const RENAMED_DESKTOP_IDS = {
     'gedit.desktop': 'org.gnome.gedit.desktop',
     'glchess.desktop': 'gnome-chess.desktop',
     'gnome-clocks.desktop': 'org.gnome.clocks.desktop',
-    'gnome-contacts.desktop': 'org.gnome.Contacts.desktop',
     'gnome-documents.desktop': 'org.gnome.Documents.desktop',
     'gnome-font-viewer.desktop': 'org.gnome.font-viewer.desktop',
     'gnome-photos.desktop': 'org.gnome.Photos.desktop',
@@ -25,7 +24,6 @@ const RENAMED_DESKTOP_IDS = {
     'gnomine.desktop': 'gnome-mines.desktop',
     'nautilus.desktop': 'org.gnome.Nautilus.desktop',
     'polari.desktop': 'org.gnome.Polari.desktop',
-    'totem.desktop': 'org.gnome.Totem.desktop',
 };
 
 const AppFavorites = new Lang.Class({

js/ui/background.js

@@ -41,6 +41,9 @@
 // MetaBackgroundActor
 //   An actor that draws the background for a single monitor
 //
+// BackgroundActor
+//   JS delegate object for MetaBackgroundActor.
+//
 // BackgroundCache
 //   A cache of Settings schema => BackgroundSource and of a single Animation.
 //   Also used to share file monitors.
@@ -51,17 +54,17 @@
 // object, which provides a single Background and correspondingly a single
 // MetaBackground object.
 //
-// BackgroundManager               BackgroundManager
-//        |        \               /        |
-//        |         BackgroundSource        |        looked up in BackgroundCache
-//        |                |                |
-//        |            Background           |
-//        |                |                |
-//   MetaBackgroundActor   |    MetaBackgroundActor
-//         \               |               /
-//          `------- MetaBackground ------'
-//                         |
-//                MetaBackgroundImage            looked up in MetaBackgroundImageCache
+// BackgroundManager---   ----- BackgroundManager
+//  BackgroundActor    \./       BackgroundActor
+//    |   |     \       |        /    |   |
+//    |   |      BackgroundSource     |   |        looked up in BackgroundCache
+//    |    \            |             /   |
+//    |     `-------Background-------`    |
+//  MetaBackgroundActor |    MetaBackgroundActor
+//     \                |                /
+//      `--------- MetaBackground-------`
+//                      |
+//             MetaBackgroundImage            looked up in MetaBackgroundImageCache
 //
 // The animated case is tricker because the animation XML file can specify different
 // files for different monitor resolutions and aspect ratios. For this reason,
@@ -71,27 +74,29 @@
 // same filename and look up the *same* MetaBackgroundImage object, so there is
 // little wasted memory:
 //
-// BackgroundManager               BackgroundManager
-//        |        \               /        |
-//        |         BackgroundSource        |        looked up in BackgroundCache
-//        |             /      \            |
-//        |     Background   Background     |
-//        |       |     \      /   |        |
-//        |       |    Animation   |        |        looked up in BackgroundCache
-// MetaBackgroundA|tor           Me|aBackgroundActor
-//         \      |                |       /
-//      MetaBackground           MetaBackground
-//                 \                 /
-//                MetaBackgroundImage            looked up in MetaBackgroundImageCache
-//                MetaBackgroundImage
+// BackgroundManager---   ----- BackgroundManager
+//  BackgroundActor    \./       BackgroundActor
+//    |   |     \       |        /     |  |
+//    |   |        BackgroundSource    |  |        looked up in BackgroundCache
+//    |    \      /           \       /   |
+//    |  Background           Background  |
+//    |      |    \           /  |        |
+//    |      |      Animation    |        |        looked up in BackgroundCache
+//  MetaBackg|oundActor     MetaB|ckgroundActor
+//       |   |                   |   |
+//       |   |                   |   |
+//  MetaBackground          MetaBackground
+//           \                  /
+//            MetaBackgroundImage         looked up in MetaBackgroundImageCache
+//            MetaBackgroundImage
 //
 // But the case of different filenames and different background images
 // is possible as well:
-//                        ....
-//      MetaBackground              MetaBackground
-//             |                          |
-//     MetaBackgroundImage         MetaBackgroundImage
-//     MetaBackgroundImage         MetaBackgroundImage
+//                   ....
+//  MetaBackground          MetaBackground
+//       |                       |
+// MetaBackgroundImage     MetaBackgroundImage
+// MetaBackgroundImage     MetaBackgroundImage
 
 const Clutter = imports.gi.Clutter;
 const GDesktopEnums = imports.gi.GDesktopEnums;
@@ -221,8 +226,7 @@ const Background = new Lang.Class({
                                         filename: null,
                                         style: null });
 
-        this.background = new Meta.Background({ meta_screen: global.screen });
-        this.background._delegate = this;
+        this.background = new Meta.Background({ 'meta-screen': global.screen });
 
         this._settings = params.settings;
         this._filename = params.filename;
@@ -430,6 +434,72 @@ const Background = new Lang.Class({
 });
 Signals.addSignalMethods(Background.prototype);
 
+const BackgroundActor = new Lang.Class({
+    Name: 'Background',
+
+    _init: function(params) {
+        params = Params.parse(params, { background: null,
+                                        monitorIndex: 0,
+                                        vignette: false });
+
+        this.actor = new Meta.BackgroundActor({ 'meta-screen': global.screen,
+                                                'monitor': params.monitorIndex,
+                                                'background': params.background.background });
+        this.actor._delegate = this;
+
+        this._vignette = params.vignette;
+        this._brightness = 1.0;
+        this._vignetteSharpness = 0.2;
+
+        if (this._vignette)
+            this.actor.add_vignette(this._vignetteSharpness, this._brightness);
+
+        if (params.background.isLoaded) {
+            this._setLoaded();
+        } else {
+            let loadedSignalId = params.background.connect('loaded',
+                Lang.bind(this, function() {
+                    params.background.disconnect(loadedSignalId);
+                    this._setLoaded();
+                }));
+        }
+    },
+
+    _setLoaded: function() {
+        if (this.isLoaded)
+            return;
+
+        this.isLoaded = true;
+
+        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+            this.emit('loaded');
+            return GLib.SOURCE_REMOVE;
+        }));
+        GLib.Source.set_name_by_id(id, '[gnome-shell] this.emit');
+    },
+
+    get brightness() {
+        return this._brightness;
+    },
+
+    set brightness(factor) {
+        this._brightness = factor;
+        if (this._vignette)
+            this.actor.add_vignette(this._brightness, this._vignetteSharpness);
+    },
+
+    get vignetteSharpness() {
+        return this._vignetteSharpness;
+    },
+
+    set vignetteSharpness(sharpness) {
+        this._vignetteSharpness = sharpness;
+        if (this._vignette)
+            this.actor.add_vignette(this._brightness, this._vignetteSharpness);
+    }
+});
+Signals.addSignalMethods(BackgroundActor.prototype);
+
 let _systemBackground;
 
 const SystemBackground = new Lang.Class({
@@ -439,13 +509,13 @@ const SystemBackground = new Lang.Class({
         let filename = global.datadir + '/theme/noise-texture.png';
 
         if (_systemBackground == null) {
-            _systemBackground = new Meta.Background({ meta_screen: global.screen });
+            _systemBackground = new Meta.Background({ 'meta-screen': global.screen });
             _systemBackground.set_filename(filename, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
-        this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
-                                                monitor: 0,
-                                                background: _systemBackground });
+        this.actor = new Meta.BackgroundActor({ 'meta-screen': global.screen,
+                                                'monitor': 0,
+                                                'background': _systemBackground });
 
         let cache = Meta.BackgroundImageCache.get_default();
         let image = cache.load(filename);
@@ -604,8 +674,8 @@ const BackgroundManager = new Lang.Class({
         this._monitorIndex = params.monitorIndex;
         this._controlPosition = params.controlPosition;
 
-        this.backgroundActor = this._createBackgroundActor();
-        this._newBackgroundActor = null;
+        this.background = this._createBackground();
+        this._newBackground = null;
     },
 
     destroy: function() {
@@ -613,95 +683,78 @@ const BackgroundManager = new Lang.Class({
         cache.releaseBackgroundSource(this._settingsSchema);
         this._backgroundSource = null;
 
-        if (this._newBackgroundActor) {
-            this._newBackgroundActor.destroy();
-            this._newBackgroundActor = null;
+        if (this._newBackground) {
+            this._newBackground.actor.destroy();
+            this._newBackground = null;
         }
 
-        if (this.backgroundActor) {
-            this.backgroundActor.destroy();
-            this.backgroundActor = null;
+        if (this.background) {
+            this.background.actor.destroy();
+            this.background = null;
         }
     },
 
-    _swapBackgroundActor: function() {
-        let oldBackgroundActor = this.backgroundActor;
-        this.backgroundActor = this._newBackgroundActor;
-        this._newBackgroundActor = null;
-        this.emit('changed');
+    _updateBackground: function() {
+        let newBackground = this._createBackground();
+        newBackground.vignetteSharpness = this.background.vignetteSharpness;
+        newBackground.brightness = this.background.brightness;
+        newBackground.visible = this.background.visible;
 
-        Tweener.addTween(oldBackgroundActor,
-                         { opacity: 0,
-                           time: FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: function() {
-                               oldBackgroundActor.destroy();
-                           }
-                         });
+        newBackground.loadedSignalId = newBackground.connect('loaded',
+            Lang.bind(this, function() {
+                newBackground.disconnect(newBackground.loadedSignalId);
+                newBackground.loadedSignalId = 0;
+
+                if (this._newBackground != newBackground) {
+                    /* Not interesting, we queued another load */
+                    newBackground.actor.destroy();
+                    return;
+                }
+
+                Tweener.addTween(this.background.actor,
+                                 { opacity: 0,
+                                   time: FADE_ANIMATION_TIME,
+                                   transition: 'easeOutQuad',
+                                   onComplete: Lang.bind(this, function() {
+                                       this.background.actor.destroy();
+                                       this.background = newBackground;
+                                       this._newBackground = null;
+
+                                       this.emit('changed');
+                                   })
+                                 });
+        }));
+
+        this._newBackground = newBackground;
     },
 
-    _updateBackgroundActor: function() {
-        if (this._newBackgroundActor) {
-            /* Skip displaying existing background queued for load */
-            this._newBackgroundActor.destroy();
-            this._newBackgroundActor = null;
-        }
-
-        let newBackgroundActor = this._createBackgroundActor();
-        newBackgroundActor.vignette_sharpness = this.backgroundActor.vignette_sharpness;
-        newBackgroundActor.brightness = this.backgroundActor.brightness;
-        newBackgroundActor.visible = this.backgroundActor.visible;
-
-        this._newBackgroundActor = newBackgroundActor;
-
-        let background = newBackgroundActor.background._delegate;
-
-        if (background.isLoaded) {
-            this._swapBackgroundActor();
-        } else {
-            newBackgroundActor.loadedSignalId = background.connect('loaded',
-                Lang.bind(this, function() {
-                    background.disconnect(newBackgroundActor.loadedSignalId);
-                    newBackgroundActor.loadedSignalId = 0;
-
-                    this._swapBackgroundActor();
-
-                }));
-        }
-    },
-
-    _createBackgroundActor: function() {
+    _createBackground: function() {
         let background = this._backgroundSource.getBackground(this._monitorIndex);
-        let backgroundActor = new Meta.BackgroundActor({ meta_screen: global.screen,
-                                                         monitor: this._monitorIndex,
-                                                         background: background.background,
-                                                         vignette: this._vignette,
-                                                         vignette_sharpness: 0.5,
-                                                         brightness: 0.5,
-                                                       });
-
-        this._container.add_child(backgroundActor);
+        let backgroundActor = new BackgroundActor({ background: background,
+                                                    monitorIndex: this._monitorIndex,
+                                                    vignette: this._vignette });
+        this._container.add_child(backgroundActor.actor);
 
         let monitor = this._layoutManager.monitors[this._monitorIndex];
 
-        backgroundActor.set_size(monitor.width, monitor.height);
+        backgroundActor.actor.set_size(monitor.width, monitor.height);
         if (this._controlPosition) {
-            backgroundActor.set_position(monitor.x, monitor.y);
-            backgroundActor.lower_bottom();
+            backgroundActor.actor.set_position(monitor.x, monitor.y);
+            backgroundActor.actor.lower_bottom();
         }
 
         let changeSignalId = background.connect('changed', Lang.bind(this, function() {
             background.disconnect(changeSignalId);
             changeSignalId = null;
-            this._updateBackgroundActor();
+            this._updateBackground();
         }));
 
-        backgroundActor.connect('destroy', Lang.bind(this, function() {
+        backgroundActor.actor.connect('destroy', Lang.bind(this, function() {
             if (changeSignalId)
                 background.disconnect(changeSignalId);
 
             if (backgroundActor.loadedSignalId)
-                backgroundActor.background._delegate.disconnect(backgroundActor.loadedSignalId);
+                background.disconnect(loadedSignalId);
         }));
 
         return backgroundActor;

js/ui/edgeDragAction.js

@@ -1,78 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-
-const EDGE_THRESHOLD = 20;
-const DRAG_DISTANCE = 80;
-
-const EdgeDragAction = new Lang.Class({
-    Name: 'EdgeDragAction',
-    Extends: Clutter.GestureAction,
-
-    _init : function(side) {
-        this.parent();
-        this._side = side;
-        this.set_n_touch_points(1);
-
-        global.display.connect('grab-op-begin', Lang.bind(this, function() {
-            this.cancel();
-        }));
-    },
-
-    _getMonitorRect : function (x, y) {
-        let rect = new Meta.Rectangle({ x: x - 1, y: y - 1, width: 1, height: 1 });
-        let monitorIndex = global.screen.get_monitor_index_for_rect(rect);
-
-        return global.screen.get_monitor_geometry(monitorIndex);
-    },
-
-    vfunc_gesture_prepare : function(action, actor) {
-        if (this.get_n_current_points() == 0)
-            return false;
-
-        let [x, y] = this.get_press_coords(0);
-        let monitorRect = this._getMonitorRect(x, y);
-
-        return ((this._side == St.Side.LEFT && x < monitorRect.x + EDGE_THRESHOLD) ||
-                (this._side == St.Side.RIGHT && x > monitorRect.x + monitorRect.width - EDGE_THRESHOLD) ||
-                (this._side == St.Side.TOP && y < monitorRect.y + EDGE_THRESHOLD) ||
-                (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
-    },
-
-    vfunc_gesture_progress : function (action, actor) {
-        let [startX, startY] = this.get_press_coords(0);
-        let [x, y] = this.get_motion_coords(0);
-        let offsetX = Math.abs (x - startX);
-        let offsetY = Math.abs (y - startY);
-
-        if (offsetX < EDGE_THRESHOLD && offsetY < EDGE_THRESHOLD)
-            return true;
-
-        if ((offsetX > offsetY &&
-             (this._side == St.Side.TOP || this._side == St.Side.BOTTOM)) ||
-            (offsetY > offsetX &&
-             (this._side == St.Side.LEFT || this._side == St.Side.RIGHT))) {
-            this.cancel();
-            return false;
-        }
-
-        return true;
-    },
-
-    vfunc_gesture_end : function (action, actor) {
-        let [startX, startY] = this.get_press_coords(0);
-        let [x, y] = this.get_motion_coords(0);
-        let monitorRect = this._getMonitorRect(startX, startY);
-
-        if ((this._side == St.Side.TOP && y > monitorRect.y + DRAG_DISTANCE) ||
-            (this._side == St.Side.BOTTOM && y < monitorRect.y + monitorRect.height - DRAG_DISTANCE) ||
-            (this._side == St.Side.LEFT && x > monitorRect.x + DRAG_DISTANCE) ||
-            (this._side == St.Side.RIGHT && x < monitorRect.x + monitorRect.width - DRAG_DISTANCE))
-            this.emit('activated');
-    }
-});
-Signals.addSignalMethods(EdgeDragAction.prototype);

js/ui/grabHelper.js

@@ -56,7 +56,7 @@ const GrabHelper = new Lang.Class({
         this._grabStack = [];
 
         this._actors = [];
-        this._ignoreUntilRelease = false;
+        this._ignoreRelease = false;
 
         this._modalCount = 0;
     },
@@ -215,7 +215,7 @@ const GrabHelper = new Lang.Class({
 
         _popGrabHelper(this);
 
-        this._ignoreUntilRelease = false;
+        this._ignoreRelease = false;
 
         Main.popModal(this._owner);
         global.sync_pointer();
@@ -228,7 +228,7 @@ const GrabHelper = new Lang.Class({
     // like the ComboBoxMenu that go away on press, but need to eat
     // the next release event.
     ignoreRelease: function() {
-        this._ignoreUntilRelease = true;
+        this._ignoreRelease = true;
     },
 
     // ungrab:

js/ui/iconGrid.js

@@ -10,29 +10,12 @@ const St = imports.gi.St;
 const Lang = imports.lang;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
-const Main = imports.ui.main;
 
 const ICON_SIZE = 96;
 const MIN_ICON_SIZE = 16;
 
 const EXTRA_SPACE_ANIMATION_TIME = 0.25;
 
-const ANIMATION_TIME_IN = 0.350;
-const ANIMATION_TIME_OUT = 1/2 * ANIMATION_TIME_IN;
-const ANIMATION_MAX_DELAY_FOR_ITEM = 2/3 * ANIMATION_TIME_IN;
-const ANIMATION_MAX_DELAY_OUT_FOR_ITEM = 2/3 * ANIMATION_TIME_OUT;
-const ANIMATION_FADE_IN_TIME_FOR_ITEM = 1/4 * ANIMATION_TIME_IN;
-
-const ANIMATION_BOUNCE_ICON_SCALE = 1.1;
-
-const AnimationDirection = {
-    IN: 0,
-    OUT: 1
-};
-
-const APPICON_ANIMATION_OUT_SCALE = 3;
-const APPICON_ANIMATION_OUT_TIME = 0.25;
-
 const BaseIcon = new Lang.Class({
     Name: 'BaseIcon',
 
@@ -190,55 +173,9 @@ const BaseIcon = new Lang.Class({
 
     _onIconThemeChanged: function() {
         this._createIconTexture(this.iconSize);
-    },
-
-    animateZoomOut: function() {
-        // Animate only the child instead of the entire actor, so the
-        // styles like hover and running are not applied while
-        // animating.
-        zoomOutActor(this.actor.child);
     }
 });
 
-function clamp(value, min, max) {
-    return Math.max(Math.min(value, max), min);
-};
-
-function zoomOutActor(actor) {
-    let actorClone = new Clutter.Clone({ source: actor,
-                                         reactive: false });
-    let [width, height] = actor.get_transformed_size();
-    let [x, y] = actor.get_transformed_position();
-    actorClone.set_size(width, height);
-    actorClone.set_position(x, y);
-    actorClone.opacity = 255;
-    actorClone.set_pivot_point(0.5, 0.5);
-
-    Main.uiGroup.add_actor(actorClone);
-
-    // Avoid monitor edges to not zoom outside the current monitor
-    let monitor = Main.layoutManager.findMonitorForActor(actor);
-    let scaledWidth = width * APPICON_ANIMATION_OUT_SCALE;
-    let scaledHeight = height * APPICON_ANIMATION_OUT_SCALE;
-    let scaledX = x - (scaledWidth - width) / 2;
-    let scaledY = y - (scaledHeight - height) / 2;
-    let containedX = clamp(scaledX, monitor.x, monitor.x + monitor.width - scaledWidth);
-    let containedY = clamp(scaledY, monitor.y, monitor.y + monitor.height - scaledHeight);
-
-    Tweener.addTween(actorClone,
-                     { time: APPICON_ANIMATION_OUT_TIME,
-                       scale_x: APPICON_ANIMATION_OUT_SCALE,
-                       scale_y: APPICON_ANIMATION_OUT_SCALE,
-                       translation_x: containedX - scaledX,
-                       translation_y: containedY - scaledY,
-                       opacity: 0,
-                       transition: 'easeOutQuad',
-                       onComplete: function() {
-                           actorClone.destroy();
-                       }
-                    });
-}
-
 const IconGrid = new Lang.Class({
     Name: 'IconGrid',
 
@@ -401,207 +338,15 @@ const IconGrid = new Lang.Class({
         }
     },
 
-    /**
-     * Intended to be override by subclasses if they need a different
-     * set of items to be animated.
-     */
-    _getChildrenToAnimate: function() {
-        return this._getVisibleChildren();
-    },
-
-    _animationDone: function() {
-        this._animating = false;
-        this.emit('animation-done');
-    },
-
-    animatePulse: function(animationDirection) {
-        if (animationDirection != AnimationDirection.IN)
-            throw new Error("Pulse animation only implements 'in' animation direction");
-
-        if (this._animating)
-            return;
-
-        this._animating = true;
-
-        let actors = this._getChildrenToAnimate();
-        if (actors.length == 0) {
-            this._animationDone();
-            return;
-        }
-
-        for (let index = 0; index < actors.length; index++) {
-            let actor = actors[index];
-            actor.opacity = 0;
-            actor.reactive = false;
-
-            let delay = index / actors.length * ANIMATION_MAX_DELAY_FOR_ITEM;
-            let [originalX, originalY] = actor.get_transformed_position();
-            let [originalWidth, originalHeight,,] = this._getAllocatedChildSizeAndSpacing(actor);
-
-            let actorClone = new Clutter.Clone({ source: actor });
-            Main.uiGroup.add_actor(actorClone);
-
-            actorClone.set_position(originalX, originalY);
-            actorClone.set_scale(0, 0);
-            actorClone.set_pivot_point(0.5, 0.5);
-            actorClone.set_size(originalWidth, originalHeight);
-
-            let bounceUpTime = ANIMATION_TIME_IN / 4;
-            // Defeat onComplete anonymous function closure
-            let isLastItem = index == actors.length - 1;
-            Tweener.addTween(actorClone,
-                            { time: bounceUpTime,
-                              transition: 'easeInOutQuad',
-                              delay: delay,
-                              scale_x: ANIMATION_BOUNCE_ICON_SCALE,
-                              scale_y: ANIMATION_BOUNCE_ICON_SCALE,
-                              onComplete: Lang.bind(this, function() {
-                                  Tweener.addTween(actorClone,
-                                                   { time: ANIMATION_TIME_IN - bounceUpTime,
-                                                     transition: 'easeInOutQuad',
-                                                     scale_x: 1,
-                                                     scale_y: 1,
-                                                     onComplete: Lang.bind(this, function() {
-                                                        if (isLastItem)
-                                                            this._animationDone();
-
-                                                        actor.opacity = 255;
-                                                        actor.reactive = true;
-                                                        actorClone.destroy();
-                                                    })
-                                                   });
-                              })
-                            });
-        }
-    },
-
-    animateSpring: function(animationDirection, sourceActor) {
-        if (this._animating)
-            return;
-
-        this._animating = true;
-
-        let actors = this._getChildrenToAnimate();
-        if (actors.length == 0) {
-            this._animationDone();
-            return;
-        }
-
-        let [sourceX, sourceY] = sourceActor.get_transformed_position();
-        let [sourceWidth, sourceHeight] = sourceActor.get_size();
-        // Get the center
-        let [sourceCenterX, sourceCenterY] = [sourceX + sourceWidth / 2, sourceY + sourceHeight / 2];
-        // Design decision, 1/2 of the source actor size.
-        let [sourceScaledWidth, sourceScaledHeight] = [sourceWidth / 2, sourceHeight / 2];
-
-        actors.forEach(function(actor) {
-            let [actorX, actorY] = actor._transformedPosition = actor.get_transformed_position();
-            let [x, y] = [actorX - sourceX, actorY - sourceY];
-            actor._distance = Math.sqrt(x * x + y * y);
-        });
-        let maxDist = actors.reduce(function(prev, cur) {
-            return Math.max(prev, cur._distance);
-        }, 0);
-        let minDist = actors.reduce(function(prev, cur) {
-            return Math.min(prev, cur._distance);
-        }, Infinity);
-        let normalization = maxDist - minDist;
-
-        for (let index = 0; index < actors.length; index++) {
-            let actor = actors[index];
-            actor.opacity = 0;
-            actor.reactive = false;
-
-            let actorClone = new Clutter.Clone({ source: actor });
-            Main.uiGroup.add_actor(actorClone);
-
-            let [width, height,,] = this._getAllocatedChildSizeAndSpacing(actor);
-            actorClone.set_size(width, height);
-            let scaleX = sourceScaledWidth / width;
-            let scaleY = sourceScaledHeight / height;
-            let [adjustedSourcePositionX, adjustedSourcePositionY] = [sourceCenterX - sourceScaledWidth / 2, sourceCenterY - sourceScaledHeight / 2];
-
-            // Defeat onComplete anonymous function closure
-            let isLastItem = index == actors.length - 1;
-
-            let movementParams, fadeParams;
-            if (animationDirection == AnimationDirection.IN) {
-                actorClone.opacity = 0;
-                actorClone.set_scale(scaleX, scaleY);
-
-                actorClone.set_position(adjustedSourcePositionX, adjustedSourcePositionY);
-
-                let delay = (1 - (actor._distance - minDist) / normalization) * ANIMATION_MAX_DELAY_FOR_ITEM;
-                let [finalX, finalY]  = actor._transformedPosition;
-                movementParams = { time: ANIMATION_TIME_IN,
-                                   transition: 'easeInOutQuad',
-                                   delay: delay,
-                                   x: finalX,
-                                   y: finalY,
-                                   scale_x: 1,
-                                   scale_y: 1,
-                                   onComplete: Lang.bind(this, function() {
-                                       if (isLastItem)
-                                           this._animationDone();
-
-                                       actor.opacity = 255;
-                                       actor.reactive = true;
-                                       actorClone.destroy();
-                                   })};
-                fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
-                               transition: 'easeInOutQuad',
-                               delay: delay,
-                               opacity: 255 };
-            } else {
-                let [startX, startY]  = actor._transformedPosition;
-                actorClone.set_position(startX, startY);
-
-                let delay = (actor._distance - minDist) / normalization * ANIMATION_MAX_DELAY_OUT_FOR_ITEM;
-                movementParams = { time: ANIMATION_TIME_OUT,
-                                   transition: 'easeInOutQuad',
-                                   delay: delay,
-                                   x: adjustedSourcePositionX,
-                                   y: adjustedSourcePositionY,
-                                   scale_x: scaleX,
-                                   scale_y: scaleY,
-                                   onComplete: Lang.bind(this, function() {
-                                       if (isLastItem) {
-                                           this._animationDone();
-                                           this._restoreItemsOpacity();
-                                       }
-                                       actorClone.destroy();
-                                   })};
-                fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
-                               transition: 'easeInOutQuad',
-                               delay: ANIMATION_TIME_OUT + delay - ANIMATION_FADE_IN_TIME_FOR_ITEM,
-                               opacity: 0 };
-            }
-
-
-            Tweener.addTween(actorClone, movementParams);
-            Tweener.addTween(actorClone, fadeParams);
-        }
-    },
-
-    _restoreItemsOpacity: function() {
-        for (let index = 0; index < this._items.length; index++) {
-            this._items[index].actor.opacity = 255;
-        }
-    },
-
-    _getAllocatedChildSizeAndSpacing: function(child) {
-        let [,, natWidth, natHeight] = child.get_preferred_size();
-        let width = Math.min(this._getHItemSize(), natWidth);
-        let xSpacing = Math.max(0, width - natWidth) / 2;
-        let height = Math.min(this._getVItemSize(), natHeight);
-        let ySpacing = Math.max(0, height - natHeight) / 2;
-        return [width, height, xSpacing, ySpacing];
-    },
-
     _calculateChildBox: function(child, x, y, box) {
+        let [childMinWidth, childMinHeight, childNaturalWidth, childNaturalHeight] =
+             child.get_preferred_size();
+
         /* Center the item in its allocation horizontally */
-        let [width, height, childXSpacing, childYSpacing] =
-            this._getAllocatedChildSizeAndSpacing(child);
+        let width = Math.min(this._getHItemSize(), childNaturalWidth);
+        let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
+        let height = Math.min(this._getVItemSize(), childNaturalHeight);
+        let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;
 
         let childBox = new Clutter.ActorBox();
         if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
@@ -801,7 +546,6 @@ const PaginatedIconGrid = new Lang.Class({
     _init: function(params) {
         this.parent(params);
         this._nPages = 0;
-        this.currentPage = 0;
         this._rowsPerPage = 0;
         this._spaceBetweenPages = 0;
         this._childrenPerPage = 0;
@@ -865,15 +609,6 @@ const PaginatedIconGrid = new Lang.Class({
         }
     },
 
-    // Overriden from IconGrid
-    _getChildrenToAnimate: function() {
-        let children = this._getVisibleChildren();
-        let firstIndex = this._childrenPerPage * this.currentPage;
-        let lastIndex = firstIndex + this._childrenPerPage;
-
-        return children.slice(firstIndex, lastIndex);
-    },
-
     _computePages: function (availWidthPerPage, availHeightPerPage) {
         let [nColumns, usedWidth] = this._computeLayout(availWidthPerPage);
         let nRows;

js/ui/keyboard.js

@@ -23,12 +23,6 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
-const CURSOR_BUS_NAME = 'org.gnome.SettingsDaemon.Cursor';
-const CURSOR_OBJECT_PATH = '/org/gnome/SettingsDaemon/Cursor';
-
-const CARIBOU_BUS_NAME = 'org.gnome.Caribou.Daemon';
-const CARIBOU_OBJECT_PATH = '/org/gnome/Caribou/Daemon';
-
 const CaribouKeyboardIface = '<node> \
 <interface name="org.gnome.Caribou.Keyboard"> \
 <method name="Show"> \
@@ -53,22 +47,6 @@ const CaribouKeyboardIface = '<node> \
 </interface> \
 </node>';
 
-const CaribouDaemonIface = '<node> \
-<interface name="org.gnome.Caribou.Daemon"> \
-<method name="Run" /> \
-<method name="Quit" /> \
-</interface> \
-</node>';
-
-const CursorManagerIface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Cursor"> \
-<property name="ShowOSK" type="b" access="read" /> \
-</interface> \
-</node>';
-
-const CaribouDaemonProxy = Gio.DBusProxy.makeProxyWrapper(CaribouDaemonIface);
-const CursorManagerProxy = Gio.DBusProxy.makeProxyWrapper(CursorManagerIface);
-
 const Key = new Lang.Class({
     Name: 'Key',
 
@@ -112,6 +90,25 @@ const Key = new Lang.Class({
                 key.release();
                 return Clutter.EVENT_PROPAGATE;
             }));
+        button.connect('touch-event', Lang.bind(this,
+            function (actor, event) {
+                let device = event.get_device();
+                let sequence = event.get_event_sequence();
+
+                if (!this._touchPressed &&
+                    event.type() == Clutter.EventType.TOUCH_BEGIN) {
+                    device.sequence_grab(sequence, actor);
+                    this._touchPressed = true;
+                    key.press();
+                } else if (this._touchPressed &&
+                           event.type() == Clutter.EventType.TOUCH_END &&
+                           device.sequence_get_grabbed_actor(sequence) == actor) {
+                    device.sequence_ungrab(sequence);
+                    this._touchPressed = false;
+                    key.release();
+                }
+                return Clutter.EVENT_PROPAGATE;
+            }));
 
         return button;
     },
@@ -173,32 +170,10 @@ const Keyboard = new Lang.Class({
         this._timestamp = global.display.get_current_time_roundtrip();
 
         this._keyboardSettings = new Gio.Settings({ schema_id: KEYBOARD_SCHEMA });
-        this._keyboardSettings.connect('changed', Lang.bind(this, this._sync));
+        this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
         this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
-        this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._sync));
-        this._watchNameId = Gio.bus_watch_name(Gio.BusType.SESSION, CURSOR_BUS_NAME, 0,
-                                               Lang.bind(this, this._sync),
-                                               Lang.bind(this, this._sync));
-        this._daemonProxy = new CaribouDaemonProxy(Gio.DBus.session, CARIBOU_BUS_NAME,
-                                                   CARIBOU_OBJECT_PATH,
-                                                   Lang.bind(this, function(proxy, error) {
-                                                       if (error) {
-                                                           log(error.message);
-                                                           return;
-                                                       }
-                                                   }));
-        this._cursorProxy = new CursorManagerProxy(Gio.DBus.session, CURSOR_BUS_NAME,
-                                                   CURSOR_OBJECT_PATH,
-                                                   Lang.bind(this, function(proxy, error) {
-                                                       if (error) {
-                                                           log(error.message);
-                                                           return;
-                                                       }
-                                                       this._cursorProxy.connect('g-properties-changed',
-                                                                                 Lang.bind(this, this._sync));
-                                                       this._sync();
-                                                   }));
-        this._sync();
+        this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._settingsChanged));
+        this._settingsChanged();
 
         this._showIdleId = 0;
         this._subkeysBoxPointer = null;
@@ -216,9 +191,8 @@ const Keyboard = new Lang.Class({
         this._redraw();
     },
 
-    _sync: function () {
-        this._enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD) ||
-                               this._cursorProxy.ShowOSK;
+    _settingsChanged: function (settings, key) {
+        this._enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD);
         if (!this._enableKeyboard && !this._keyboard)
             return;
         if (this._enableKeyboard && this._keyboard &&
@@ -248,22 +222,9 @@ const Keyboard = new Lang.Class({
         this.actor = null;
 
         this._destroySource();
-        this._daemonProxy.QuitRemote(function (result, error) {
-            if (error) {
-                log(error.message);
-                return;
-            }
-        });
     },
 
     _setupKeyboard: function() {
-        this._daemonProxy.RunRemote(function (result, error) {
-            if (error) {
-                log(error.message);
-                return;
-            }
-        });
-
         this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });
         Main.layoutManager.keyboardBox.add_actor(this.actor);
         Main.layoutManager.trackChrome(this.actor);

js/ui/layout.js

@@ -361,7 +361,7 @@ const LayoutManager = new Lang.Class({
     },
 
     _addBackgroundMenu: function(bgManager) {
-        BackgroundMenu.addBackgroundMenu(bgManager.backgroundActor, this);
+        BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this);
     },
 
     _createBackgroundManager: function(monitorIndex) {
@@ -378,10 +378,10 @@ const LayoutManager = new Lang.Class({
     _showSecondaryBackgrounds: function() {
         for (let i = 0; i < this.monitors.length; i++) {
             if (i != this.primaryIndex) {
-                let backgroundActor = this._bgManagers[i].backgroundActor;
-                backgroundActor.show();
-                backgroundActor.opacity = 0;
-                Tweener.addTween(backgroundActor,
+                let background = this._bgManagers[i].background;
+                background.actor.show();
+                background.actor.opacity = 0;
+                Tweener.addTween(background.actor,
                                  { opacity: 255,
                                    time: BACKGROUND_FADE_ANIMATION_TIME,
                                    transition: 'easeOutQuad' });
@@ -404,7 +404,7 @@ const LayoutManager = new Lang.Class({
             this._bgManagers.push(bgManager);
 
             if (i != this.primaryIndex && this._startingUp)
-                bgManager.backgroundActor.hide();
+                bgManager.background.actor.hide();
         }
     },
 

js/ui/messageTray.js

@@ -15,7 +15,6 @@ const Signals = imports.signals;
 const St = imports.gi.St;
 const Tp = imports.gi.TelepathyGLib;
 
-const EdgeDragAction = imports.ui.edgeDragAction;
 const BoxPointer = imports.ui.boxpointer;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const GnomeSession = imports.misc.gnomeSession;
@@ -1934,10 +1933,6 @@ const MessageTray = new Lang.Class({
 
         this._messageTrayMenuButton = new MessageTrayMenuButton(this);
         this.actor.add_actor(this._messageTrayMenuButton.actor);
-
-        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM);
-        gesture.connect('activated', Lang.bind(this, this.toggle));
-        global.stage.add_action(gesture);
     },
 
     close: function() {

js/ui/overview.js

@@ -193,9 +193,11 @@ const Overview = new Lang.Class({
     _unshadeBackgrounds: function() {
         let backgrounds = this._backgroundGroup.get_children();
         for (let i = 0; i < backgrounds.length; i++) {
-            Tweener.addTween(backgrounds[i],
+            let background = backgrounds[i]._delegate;
+
+            Tweener.addTween(background,
                              { brightness: 1.0,
-                               vignette_sharpness: 0.0,
+                               vignetteSharpness: 0.0,
                                time: SHADE_ANIMATION_TIME,
                                transition: 'easeOutQuad'
                              });
@@ -205,9 +207,11 @@ const Overview = new Lang.Class({
     _shadeBackgrounds: function() {
         let backgrounds = this._backgroundGroup.get_children();
         for (let i = 0; i < backgrounds.length; i++) {
-            Tweener.addTween(backgrounds[i],
+            let background = backgrounds[i]._delegate;
+
+            Tweener.addTween(background,
                              { brightness: Lightbox.VIGNETTE_BRIGHTNESS,
-                               vignette_sharpness: Lightbox.VIGNETTE_SHARPNESS,
+                               vignetteSharpness: Lightbox.VIGNETTE_SHARPNESS,
                                time: SHADE_ANIMATION_TIME,
                                transition: 'easeOutQuad'
                              });
@@ -671,10 +675,6 @@ const Overview = new Lang.Class({
             this.hide();
         else
             this.show();
-    },
-
-    getShowAppsButton: function() {
-        return this._dash.showAppsButton;
     }
 });
 Signals.addSignalMethods(Overview.prototype);

js/ui/overviewControls.js

@@ -36,7 +36,7 @@ const SlideLayout = new Lang.Class({
 
     _init: function(params) {
         this._slideX = 1;
-        this._translationX = undefined;
+        this._translationX = 0;
         this._direction = SlideDirection.LEFT;
 
         this.parent(params);
@@ -161,8 +161,7 @@ const SlidingControl = new Lang.Class({
         let translationEnd = 0;
         let translation = this._getTranslation();
 
-        let shouldShow = (this._getSlide() > 0);
-        if (shouldShow) {
+        if (this._visible) {
             translationStart = translation;
         } else {
             translationEnd = translation;
@@ -178,8 +177,8 @@ const SlidingControl = new Lang.Class({
     },
 
     _onOverviewHiding: function() {
-        // We need to explicitly slideOut since showing pages
-        // doesn't imply sliding out, instead, hiding the overview does.
+        // We need to explicitily slideOut since showing pages
+        // doesn't implies to slide out, instead, hiding the overview does.
         this.slideOut();
     },
 
@@ -193,7 +192,7 @@ const SlidingControl = new Lang.Class({
 
     _onDragBegin: function() {
         this._inDrag = true;
-        this._updateTranslation();
+        this.layout.translationX = 0;
         this._updateSlide();
     },
 
@@ -218,6 +217,7 @@ const SlidingControl = new Lang.Class({
 
     slideIn: function() {
         this._visible = true;
+        this._updateTranslation();
         // we will update slideX and the translation from pageEmpty
     },
 

js/ui/panelMenu.js

@@ -101,6 +101,7 @@ const Button = new Lang.Class({
                       accessible_role: Atk.Role.MENU });
 
         this.actor.connect('event', Lang.bind(this, this._onEvent));
+        this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
         this.actor.connect('notify::visible', Lang.bind(this, this._onVisibilityChanged));
 
         if (dontCreateMenu)
@@ -139,6 +140,26 @@ const Button = new Lang.Class({
         return Clutter.EVENT_PROPAGATE;
     },
 
+    _onSourceKeyPress: function(actor, event) {
+        if (!this.menu)
+            return Clutter.EVENT_PROPAGATE;
+
+        let symbol = event.get_key_symbol();
+        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
+            this.menu.toggle();
+            return Clutter.EVENT_STOP;
+        } else if (symbol == Clutter.KEY_Escape && this.menu.isOpen) {
+            this.menu.close();
+            return Clutter.EVENT_STOP;
+        } else if (symbol == Clutter.KEY_Down) {
+            if (!this.menu.isOpen)
+                this.menu.toggle();
+            this.menu.actor.navigate_focus(this.actor, Gtk.DirectionType.DOWN, false);
+            return Clutter.EVENT_STOP;
+        } else
+            return Clutter.EVENT_PROPAGATE;
+    },
+
     _onVisibilityChanged: function() {
         if (!this.menu)
             return;

js/ui/popupMenu.js

@@ -731,10 +731,6 @@ const PopupMenu = new Lang.Class({
         global.focus_manager.add_group(this.actor);
         this.actor.reactive = true;
 
-        if (this.sourceActor)
-            this._keyPressId = this.sourceActor.connect('key-press-event',
-                                                        Lang.bind(this, this._onKeyPress));
-
         this._openedSubMenu = null;
     },
 
@@ -745,40 +741,6 @@ const PopupMenu = new Lang.Class({
         this._openedSubMenu = submenu;
     },
 
-    _onKeyPress: function(actor, event) {
-        let navKey;
-        switch (this._boxPointer.arrowSide) {
-            case St.Side.TOP:
-                navKey = Clutter.KEY_Down;
-                break;
-            case St.Side.BOTTOM:
-                navKey = Clutter.KEY_Up;
-                break;
-            case St.Side.LEFT:
-                navKey = Clutter.KEY_Right;
-                break;
-            case St.Side.RIGHT:
-                navKey = Clutter.KEY_Left;
-                break;
-        }
-
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
-            this.toggle();
-            return Clutter.EVENT_STOP;
-        } else if (symbol == Clutter.KEY_Escape && this.isOpen) {
-            this.close();
-            return Clutter.EVENT_STOP;
-        } else if (symbol == navKey) {
-            if (!this.isOpen)
-                this.toggle();
-            this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-            return Clutter.EVENT_STOP;
-        } else
-            return Clutter.EVENT_PROPAGATE;
-    },
-
-
     setArrowOrigin: function(origin) {
         this._boxPointer.setArrowOrigin(origin);
     },
@@ -819,12 +781,6 @@ const PopupMenu = new Lang.Class({
 
         this.isOpen = false;
         this.emit('open-state-changed', false);
-    },
-
-    destroy: function() {
-        if (this._keyPressId)
-            this.sourceActor.disconnect(this._keyPressId);
-        this.parent();
     }
 });
 
@@ -922,10 +878,8 @@ const PopupSubMenu = new Lang.Class({
             let [minHeight, naturalHeight] = this.actor.get_preferred_height(-1);
             this.actor.height = 0;
             this.actor._arrowRotation = this._arrow.rotation_angle_z;
-            let angle = this.actor._arrowRotation;
-            // animate to the first multiple of 90 greater than current angle
             Tweener.addTween(this.actor,
-                             { _arrowRotation: angle - angle % 90 + 90,
+                             { _arrowRotation: this.actor._arrowRotation + 90,
                                height: naturalHeight,
                                time: 0.25,
                                onUpdateScope: this,
@@ -957,10 +911,8 @@ const PopupSubMenu = new Lang.Class({
 
         if (animate) {
             this.actor._arrowRotation = this._arrow.rotation_angle_z;
-            let angle = this.actor._arrowRotation;
-            // animate to the first multiple of 90 less than current angle
             Tweener.addTween(this.actor,
-                             { _arrowRotation: (angle - 1) - (angle - 1) % 90,
+                             { _arrowRotation: this.actor._arrowRotation - 90,
                                height: 0,
                                time: 0.25,
                                onUpdateScope: this,

js/ui/screenShield.js

@@ -687,10 +687,10 @@ const ScreenShield = new Lang.Class({
             return Clutter.EVENT_PROPAGATE;
 
         let delta = 0;
-        if (event.get_scroll_direction() == Clutter.ScrollDirection.SMOOTH)
-            delta = Math.abs(event.get_scroll_delta()[0]);
-        else
+        if (event.get_scroll_direction() == Clutter.ScrollDirection.UP)
             delta = 5;
+        else if (event.get_scroll_direction() == Clutter.ScrollDirection.SMOOTH)
+            delta = Math.max(0, event.get_scroll_delta()[0]);
 
         this._lockScreenScrollCounter += delta;
 

js/ui/search.js

@@ -6,7 +6,6 @@ const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Atk = imports.gi.Atk;
 
@@ -165,6 +164,13 @@ const SearchResult = new Lang.Class({
 
     activate: function() {
         this.emit('activate', this.metaInfo.id);
+    },
+
+    setSelected: function(selected) {
+        if (selected)
+            this.actor.add_style_pseudo_class('selected');
+        else
+            this.actor.remove_style_pseudo_class('selected');
     }
 });
 Signals.addSignalMethods(SearchResult.prototype);
@@ -225,11 +231,59 @@ const GridSearchResult = new Lang.Class({
 
         this.actor.style_class = 'grid-search-result';
 
-        this.icon = new IconGrid.BaseIcon(this.metaInfo['name'],
-                                          { createIcon: this.metaInfo['createIcon'] });
-        let content = new St.Bin({ child: this.icon.actor });
-        this.actor.set_child(content);
-        this.actor.label_actor = this.icon.label;
+        let content = provider.createResultObject(metaInfo);
+        let dragSource = null;
+
+        if (content == null) {
+            let actor = new St.Bin();
+            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
+                                             { createIcon: this.metaInfo['createIcon'] });
+            actor.set_child(icon.actor);
+            actor.label_actor = icon.label;
+            dragSource = icon.icon;
+            content = { actor: actor, icon: icon };
+        } else {
+            if (content.getDragActorSource)
+                dragSource = content.getDragActorSource();
+        }
+
+        this.actor.set_child(content.actor);
+        this.actor.label_actor = content.actor.label_actor;
+        this.icon = content.icon;
+
+        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-cancelled',
+                          Lang.bind(this, function() {
+                              Main.overview.cancelledItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));
+
+        if (!dragSource)
+            // not exactly right, but alignment problems are hard to notice
+            dragSource = content.actor;
+        this._dragActorSource = dragSource;
+    },
+
+    getDragActorSource: function() {
+        return this._dragActorSource;
+    },
+
+    getDragActor: function() {
+        return this.metaInfo['createIcon'](Main.overview.dashIconSize);
+    },
+
+    shellWorkspaceLaunch: function(params) {
+        if (this.provider.dragActivateResult)
+            this.provider.dragActivateResult(this.metaInfo.id, params);
+        else
+            this.provider.activateResult(this.metaInfo.id, this.terms);
     }
 });
 
@@ -261,11 +315,7 @@ const SearchResultsBase = new Lang.Class({
         this._terms = [];
     },
 
-    _createResultDisplay: function(meta) {
-        if (this.provider.createResultObject)
-            return this.provider.createResultObject(meta);
-
-        return null;
+    _clearResultDisplay: function() {
     },
 
     clear: function() {
@@ -367,7 +417,6 @@ const ListSearchResults = new Lang.Class({
         this.providerIcon.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
         this.providerIcon.connect('clicked', Lang.bind(this,
             function() {
-                this.providerIcon.animateLaunch();
                 provider.launchSearch(this._terms);
                 Main.overview.toggle();
             }));
@@ -397,7 +446,7 @@ const ListSearchResults = new Lang.Class({
     },
 
     _createResultDisplay: function(meta) {
-        return this.parent(meta) || new ListSearchResult(this.provider, meta);
+        return new ListSearchResult(this.provider, meta);
     },
 
     _addItem: function(display) {
@@ -445,7 +494,7 @@ const GridSearchResults = new Lang.Class({
     },
 
     _createResultDisplay: function(meta) {
-        return this.parent(meta) || new GridSearchResult(this.provider, meta);
+        return new GridSearchResult(this.provider, meta);
     },
 
     _addItem: function(display) {
@@ -581,8 +630,13 @@ const SearchResults = new Lang.Class({
         }
 
         if (newDefaultResult != this._defaultResult) {
-            this._setSelected(this._defaultResult, false);
-            this._setSelected(newDefaultResult, this._highlightDefault);
+            if (this._defaultResult)
+                this._defaultResult.setSelected(false);
+            if (newDefaultResult) {
+                newDefaultResult.setSelected(this._highlightDefault);
+                if (this._highlightDefault)
+                    Util.ensureActorVisibleInScrollView(this._scrollView, newDefaultResult.actor);
+            }
 
             this._defaultResult = newDefaultResult;
         }
@@ -619,7 +673,11 @@ const SearchResults = new Lang.Class({
 
     highlightDefault: function(highlight) {
         this._highlightDefault = highlight;
-        this._setSelected(this._defaultResult, highlight);
+        if (this._defaultResult) {
+            this._defaultResult.setSelected(highlight);
+            if (highlight)
+                Util.ensureActorVisibleInScrollView(this._scrollView, this._defaultResult.actor);
+        }
     },
 
     navigateFocus: function(direction) {
@@ -634,18 +692,6 @@ const SearchResults = new Lang.Class({
 
         let from = this._defaultResult ? this._defaultResult.actor : null;
         this.actor.navigate_focus(from, direction, false);
-    },
-
-    _setSelected: function(result, selected) {
-        if (!result)
-            return;
-
-        if (selected) {
-            result.actor.add_style_pseudo_class('selected');
-            Util.ensureActorVisibleInScrollView(this._scrollView, result.actor);
-        } else {
-            result.actor.remove_style_pseudo_class('selected');
-        }
     }
 });
 
@@ -679,12 +725,5 @@ const ProviderIcon = new Lang.Class({
                                  gicon: provider.appInfo.get_icon() });
         this._content.add_actor(icon);
         this._content.add_actor(this.moreIcon);
-    },
-
-    animateLaunch: function() {
-        let appSys = Shell.AppSystem.get_default();
-        let app = appSys.lookup_app(this.provider.appInfo.get_id());
-        if (app.state == Shell.AppState.STOPPED)
-            IconGrid.zoomOutActor(this._content);
     }
 });

js/ui/viewSelector.js

@@ -19,8 +19,6 @@ const Search = imports.ui.search;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const WorkspacesView = imports.ui.workspacesView;
-const EdgeDragAction = imports.ui.edgeDragAction;
-const IconGrid = imports.ui.iconGrid;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 
@@ -51,6 +49,77 @@ function getTermsForSearchString(searchString) {
     return terms;
 }
 
+const EDGE_THRESHOLD = 20;
+const DRAG_DISTANCE = 80;
+
+const EdgeDragAction = new Lang.Class({
+    Name: 'EdgeDragAction',
+    Extends: Clutter.GestureAction,
+
+    _init : function(side) {
+        this.parent();
+        this._side = side;
+        this.set_n_touch_points(1);
+
+        global.display.connect('grab-op-begin', Lang.bind(this, function() {
+            this.cancel();
+        }));
+    },
+
+    _getMonitorRect : function (x, y) {
+        let rect = new Meta.Rectangle({ x: x - 1, y: y - 1, width: 1, height: 1 });
+        let monitorIndex = global.screen.get_monitor_index_for_rect(rect);
+
+        return global.screen.get_monitor_geometry(monitorIndex);
+    },
+
+    vfunc_gesture_prepare : function(action, actor) {
+        if (this.get_n_current_points() == 0)
+            return false;
+
+        let [x, y] = this.get_press_coords(0);
+        let monitorRect = this._getMonitorRect(x, y);
+
+        return ((this._side == St.Side.LEFT && x < monitorRect.x + EDGE_THRESHOLD) ||
+                (this._side == St.Side.RIGHT && x > monitorRect.x + monitorRect.width - EDGE_THRESHOLD) ||
+                (this._side == St.Side.TOP && y < monitorRect.y + EDGE_THRESHOLD) ||
+                (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
+    },
+
+    vfunc_gesture_progress : function (action, actor) {
+        let [startX, startY] = this.get_press_coords(0);
+        let [x, y] = this.get_motion_coords(0);
+        let offsetX = Math.abs (x - startX);
+        let offsetY = Math.abs (y - startY);
+
+        if (offsetX < EDGE_THRESHOLD && offsetY < EDGE_THRESHOLD)
+            return true;
+
+        if ((offsetX > offsetY &&
+             (this._side == St.Side.TOP || this._side == St.Side.BOTTOM)) ||
+            (offsetY > offsetX &&
+             (this._side == St.Side.LEFT || this._side == St.Side.RIGHT))) {
+            this.cancel();
+            return false;
+        }
+
+        return true;
+    },
+
+    vfunc_gesture_end : function (action, actor) {
+        let [startX, startY] = this.get_press_coords(0);
+        let [x, y] = this.get_motion_coords(0);
+        let monitorRect = this._getMonitorRect(startX, startY);
+
+        if ((this._side == St.Side.TOP && y > monitorRect.y + DRAG_DISTANCE) ||
+            (this._side == St.Side.BOTTOM && y < monitorRect.y + monitorRect.height - DRAG_DISTANCE) ||
+            (this._side == St.Side.LEFT && x > monitorRect.x + DRAG_DISTANCE) ||
+            (this._side == St.Side.RIGHT && x < monitorRect.x + monitorRect.width - DRAG_DISTANCE))
+            this.emit('activated');
+    }
+});
+Signals.addSignalMethods(EdgeDragAction.prototype);
+
 const ShowOverviewAction = new Lang.Class({
     Name: 'ShowOverviewAction',
     Extends: Clutter.GestureAction,
@@ -218,7 +287,7 @@ const ViewSelector = new Lang.Class({
 
         let gesture;
 
-        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
+        gesture = new EdgeDragAction(St.Side.LEFT);
         gesture.connect('activated', Lang.bind(this, function() {
             if (Main.overview.visible)
                 Main.overview.hide();
@@ -302,55 +371,18 @@ const ViewSelector = new Lang.Class({
         return page;
     },
 
-    _fadePageIn: function() {
-        Tweener.addTween(this._activePage,
-                         { opacity: 255,
-                           time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    _fadePageOut: function(page) {
-        let oldPage = page;
-        Tweener.addTween(page,
-                         { opacity: 0,
-                           time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this._animateIn(oldPage);
-                           })
-                         });
-    },
-
-    _animateIn: function(oldPage) {
+    _fadePageIn: function(oldPage) {
         if (oldPage)
             oldPage.hide();
 
         this.emit('page-empty');
 
         this._activePage.show();
-
-        if (this._activePage == this._appsPage && oldPage == this._workspacesPage) {
-            // Restore opacity, in case we animated via _fadePageOut
-            this._activePage.opacity = 255;
-            this.appDisplay.animate(IconGrid.AnimationDirection.IN);
-        } else {
-            this._fadePageIn();
-        }
-    },
-
-    _animateOut: function(page) {
-        let oldPage = page;
-        if (page == this._appsPage &&
-            this._activePage == this._workspacesPage &&
-            !Main.overview.animationInProgress) {
-            this.appDisplay.animate(IconGrid.AnimationDirection.OUT, Lang.bind(this,
-                function() {
-                    this._animateIn(oldPage)
-                }));
-        } else {
-            this._fadePageOut(page);
-        }
+        Tweener.addTween(this._activePage,
+            { opacity: 255,
+              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+              transition: 'easeOutQuad'
+            });
     },
 
     _showPage: function(page) {
@@ -365,9 +397,17 @@ const ViewSelector = new Lang.Class({
         this.emit('page-changed');
 
         if (oldPage)
-            this._animateOut(oldPage)
+            Tweener.addTween(oldPage,
+                             { opacity: 0,
+                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this,
+                                   function() {
+                                       this._fadePageIn(oldPage);
+                                   })
+                             });
         else
-            this._animateIn();
+            this._fadePageIn();
     },
 
     _a11yFocusPage: function(page) {

js/ui/windowManager.js

@@ -17,7 +17,6 @@ const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
 const WindowMenu = imports.ui.windowMenu;
-const Wobbly = imports.ui.wobbly;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const MAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
@@ -812,8 +811,6 @@ const WindowManager = new Lang.Class({
         gesture = new AppSwitchAction();
         gesture.connect('activated', Lang.bind(this, this._switchApp));
         global.stage.add_action(gesture);
-
-        this._wobblyWindows = new Wobbly.WobblyWindowManager();
     },
 
     _lookupIndex: function (windows, metaWindow) {

js/ui/wobbly.js

@@ -1,130 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-
-function clampAbs(v, cap) {
-    if (v > cap)
-        v = cap;
-    if (v < -cap)
-        v = -cap;
-    return v;
-}
-
-const ActorWobbler = new Lang.Class({
-    Name: 'ActorWobbler',
-
-    _init: function(actor) {
-        this._actor = actor;
-        this._effect = new Shell.WobblyEffect();
-        this._actor.add_effect(this._effect);
-        this._actor._wobbler = this;
-
-        this._currentBend = 0;
-        this._currentHeightOffset = 0;
-        this._running = false;
-
-        this._allocationChangedId = this._actor.connect('allocation-changed', Lang.bind(this, this._allocationChanged));
-
-        this._timeline = new Clutter.Timeline({ duration: 100, repeat_count: -1 });
-        this._timeline.connect('new-frame', Lang.bind(this, this._newFrame));
-        this._timeline.start();
-    },
-
-    start: function() {
-        this._running = true;
-    },
-
-    stop: function() {
-        this._running = false;
-    },
-
-    _destroy: function() {
-        this._timeline.run_dispose();
-        this._timeline = null;
-
-        this._actor.disconnect(this._allocationChangedId);
-        this._actor.scale_y = 1.0;
-        this._actor.remove_effect(this._effect);
-        this._actor._wobbler = null;
-    },
-
-    _newFrame: function() {
-        this._step();
-    },
-
-    _step: function() {
-        const DAMPEN = 0.8;
-        this._currentBend *= DAMPEN;
-        if (Math.abs(this._currentBend) < 1)
-            this._currentBend = 0;
-        this._currentHeightOffset *= DAMPEN;
-        if (Math.abs(this._currentHeightOffset) < 1)
-            this._currentHeightOffset = 0;
-
-        // Cap the bend to a 100px shift.
-        const BEND_CAP = 50;
-        this._currentBend = clampAbs(this._currentBend, BEND_CAP);
-        this._effect.set_bend_x(this._currentBend);
-
-        // Cap the height change to 25px in either direction.
-        const HEIGHT_OFFSET_CAP = 25;
-        this._currentHeightOffset = clampAbs(this._currentHeightOffset, HEIGHT_OFFSET_CAP);
-        let [minHeight, natHeight] = this._actor.get_preferred_height(-1);
-        let scale = (natHeight + this._currentHeightOffset) / natHeight;
-        this._actor.scale_y = scale;
-
-        if (!this._running && this._currentBend == 0 && this._currentHeightOffset == 0)
-            this._destroy();
-    },
-
-    _allocationChanged: function(actor, box, flags) {
-        if (!this._running)
-            return;
-
-        if (this._oldX) {
-            let deltaX = box.x1 - this._oldX;
-            // Every 2px the user moves the window, we bend it by 1px.
-            this._currentBend -= deltaX / 2;
-        }
-
-        if (this._oldY) {
-            let deltaY = box.y1 - this._oldY;
-            // Every 2px the user moves the window, we scale it by 1px.
-            this._currentHeightOffset -= deltaY / 2;
-        }
-
-        this._oldX = box.x1;
-        this._oldY = box.y1;
-    },
-});
-
-const WobblyWindowManager = new Lang.Class({
-    Name: 'WobblyWindowManager',
-
-    _init: function() {
-        global.display.connect('grab-op-begin', Lang.bind(this, this._grabOpBegin));
-        global.display.connect('grab-op-end', Lang.bind(this, this._grabOpEnd));
-    },
-
-    _grabOpBegin: function(display, screen, window, op) {
-        if (op != Meta.GrabOp.MOVING)
-            return;
-
-        let actor = window.get_compositor_private();
-        if (!actor._wobbler)
-            new ActorWobbler(actor);
-        actor._wobbler.start();
-    },
-
-    _grabOpEnd: function(display, screen, window, op) {
-        if (!window)
-            return;
-
-        let actor = window.get_compositor_private();
-        if (actor._wobbler)
-            actor._wobbler.stop();
-    },
-});

js/ui/workspace.js

@@ -1417,6 +1417,10 @@ const Workspace = new Lang.Class({
         if (index == -1)
             return;
 
+        // Check if window still should be here
+        if (win && this._isMyWindow(win))
+            return;
+
         let clone = this._windows[index];
 
         this._windows.splice(index, 1);

js/ui/workspaceThumbnail.js

@@ -332,7 +332,7 @@ const WorkspaceThumbnail = new Lang.Class({
             let clone = this._windows[i];
             let metaWindow = clone.metaWindow;
             if (i == 0) {
-                clone.setStackAbove(this._bgManager.backgroundActor);
+                clone.setStackAbove(this._bgManager.background.actor);
             } else {
                 let previousClone = this._windows[i - 1];
                 clone.setStackAbove(previousClone.actor);
@@ -367,6 +367,10 @@ const WorkspaceThumbnail = new Lang.Class({
         if (index == -1)
             return;
 
+        // Check if window still should be here
+        if (win && this._isMyWindow(win) && this._isOverviewWindow(win))
+            return;
+
         let clone = this._windows[index];
         this._windows.splice(index, 1);
 
@@ -531,7 +535,7 @@ const WorkspaceThumbnail = new Lang.Class({
         this._contents.add_actor(clone.actor);
 
         if (this._windows.length == 0)
-            clone.setStackAbove(this._bgManager.backgroundActor);
+            clone.setStackAbove(this._bgManager.background.actor);
         else
             clone.setStackAbove(this._windows[this._windows.length - 1].actor);
 

src/Makefile.am

@@ -101,9 +101,7 @@ shell_public_headers_h =		\
 	shell-tray-manager.h		\
 	shell-util.h			\
 	shell-window-tracker.h		\
-	shell-wm.h			\
-	shell-wobbly-effect.h		\
-	$(NULL)
+	shell-wm.h
 
 if HAVE_NETWORKMANAGER
 shell_public_headers_h +=  shell-network-agent.h
@@ -168,7 +166,6 @@ libgnome_shell_sources =		\
 	shell-util.c			\
 	shell-window-tracker.c		\
 	shell-wm.c			\
-	shell-wobbly-effect.c		\
 	$(NULL)
 
 libgnome_shell_built_sources =		\

src/main.c

@@ -260,8 +260,6 @@ shell_perf_log_init (void)
 static void
 shell_a11y_init (void)
 {
-  cally_accessibility_init ();
-
   if (clutter_get_accessibility_enabled () == FALSE)
     {
       g_warning ("Accessibility: clutter has no accessibility enabled"
@@ -424,7 +422,10 @@ main (int argc, char **argv)
   meta_set_wm_name (WM_NAME);
   meta_set_gnome_wm_keybindings (GNOME_WM_KEYBINDINGS);
 
+  /* Prevent meta_init() from causing gtk to load gail and at-bridge */
+  g_setenv ("NO_AT_BRIDGE", "1", TRUE);
   meta_init ();
+  g_unsetenv ("NO_AT_BRIDGE");
 
   /* FIXME: Add gjs API to set this stuff and don't depend on the
    * environment.  These propagate to child processes.

src/shell-glsl-quad.c

@@ -23,13 +23,6 @@ struct _ShellGLSLQuadPrivate
   CoglPipeline  *pipeline;
 };
 
-static gboolean
-shell_glsl_quad_get_paint_volume (ClutterActor       *actor,
-                                  ClutterPaintVolume *volume)
-{
-  return clutter_paint_volume_set_from_allocation (volume, actor);
-}
-
 static void
 shell_glsl_quad_paint (ClutterActor *actor)
 {
@@ -158,7 +151,6 @@ shell_glsl_quad_class_init (ShellGLSLQuadClass *klass)
   gobject_class->constructed = shell_glsl_quad_constructed;
   gobject_class->dispose = shell_glsl_quad_dispose;
 
-  actor_class->get_paint_volume = shell_glsl_quad_get_paint_volume;
   actor_class->paint = shell_glsl_quad_paint;
 
   g_type_class_add_private (klass, sizeof (ShellGLSLQuadPrivate));

src/shell-wobbly-effect.c

@@ -1,216 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2014 Endless Mobile
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jasper St. Pierre <jstpierre@mecheye.net>
- */
-
-#include "config.h"
-
-#include "shell-wobbly-effect.h"
-
-struct _ShellWobblyEffectPrivate
-{
-  int bend_x;
-
-  int tex_width, tex_height;
-  CoglPipeline *pipeline;
-
-  int tex_width_uniform;
-  int bend_x_uniform;
-};
-typedef struct _ShellWobblyEffectPrivate ShellWobblyEffectPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (ShellWobblyEffect, shell_wobbly_effect, CLUTTER_TYPE_OFFSCREEN_EFFECT);
-
-static const gchar *wobbly_decls =
-  "uniform int tex_width;\n"
-  "uniform int bend_x;\n";
-static const gchar *wobbly_pre =
-  "float bend_x_coord = (float(bend_x) / tex_width);\n"
-  "float interp = (1 - cos(cogl_tex_coord.y * 3.1415926)) / 2;\n"
-  "cogl_tex_coord.x -= (interp * bend_x_coord);\n";
-
-/* XXX - clutter_effect_get_paint_volume is fucking terrible
- * and I want to kill myself */
-static gboolean
-shell_wobbly_effect_get_paint_volume (ClutterEffect      *effect,
-                                      ClutterPaintVolume *volume)
-{
-  ShellWobblyEffect *self = SHELL_WOBBLY_EFFECT (effect);
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-
-  float cur_width;
-  cur_width = clutter_paint_volume_get_width (volume);
-  cur_width += ABS (priv->bend_x);
-  clutter_paint_volume_set_width (volume, cur_width);
-
-  /* Also modify the origin if it bends to the left. */
-  if (priv->bend_x < 0)
-    {
-      ClutterVertex origin;
-      clutter_paint_volume_get_origin (volume, &origin);
-      origin.x += priv->bend_x;
-      clutter_paint_volume_set_origin (volume, &origin);
-    }
-
-  return TRUE;
-}
-
-static gboolean
-shell_wobbly_effect_pre_paint (ClutterEffect *effect)
-{
-  ShellWobblyEffect *self = SHELL_WOBBLY_EFFECT (effect);
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-
-  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
-    return FALSE;
-
-  /* If we're not doing any bending, we're not needed. */
-  if (priv->bend_x == 0)
-    return FALSE;
-
-  if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
-    {
-      /* if we don't have support for GLSL shaders then we
-       * forcibly disable the ActorMeta
-       */
-      g_warning ("Unable to use the ShellWobblyEffect: the "
-                 "graphics hardware or the current GL driver does not "
-                 "implement support for the GLSL shading language. The "
-                 "effect will be disabled.");
-      clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE);
-      return FALSE;
-    }
-
-  if (!CLUTTER_EFFECT_CLASS (shell_wobbly_effect_parent_class)->pre_paint (effect))
-    return FALSE;
-
-  ClutterOffscreenEffect *offscreen_effect = CLUTTER_OFFSCREEN_EFFECT (effect);
-  CoglObject *texture;
-
-  texture = clutter_offscreen_effect_get_texture (offscreen_effect);
-  cogl_pipeline_set_layer_texture (priv->pipeline, 0, texture);
-
-  priv->tex_width = cogl_texture_get_width (texture);
-  priv->tex_height = cogl_texture_get_height (texture);
-
-  cogl_pipeline_set_uniform_1i (priv->pipeline, priv->tex_width_uniform, priv->tex_width);
-
-  return TRUE;
-}
-
-static void
-shell_wobbly_effect_paint_target (ClutterOffscreenEffect *effect)
-{
-  ShellWobblyEffect *self = SHELL_WOBBLY_EFFECT (effect);
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-  CoglFramebuffer *fb = cogl_get_draw_framebuffer ();
-  ClutterActor *actor;
-  guint8 paint_opacity;
-
-  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
-  paint_opacity = clutter_actor_get_paint_opacity (actor);
-
-  cogl_pipeline_set_color4ub (priv->pipeline,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity);
-
-  cogl_framebuffer_draw_rectangle (fb, priv->pipeline,
-                                   0, 0, priv->tex_width, priv->tex_height);
-}
-
-static void
-shell_wobbly_effect_dispose (GObject *object)
-{
-  ShellWobblyEffect *self = SHELL_WOBBLY_EFFECT (object);
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-
-  g_clear_pointer (&priv->pipeline, cogl_object_unref);
-
-  G_OBJECT_CLASS (shell_wobbly_effect_parent_class)->dispose (object);
-}
-
-static void
-shell_wobbly_effect_class_init (ShellWobblyEffectClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass);
-  ClutterOffscreenEffectClass *offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
-
-  offscreen_class->paint_target = shell_wobbly_effect_paint_target;
-  effect_class->pre_paint = shell_wobbly_effect_pre_paint;
-  effect_class->get_paint_volume = shell_wobbly_effect_get_paint_volume;
-  object_class->dispose = shell_wobbly_effect_dispose;
-}
-
-static void
-update_uniforms (ShellWobblyEffect *self)
-{
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-  cogl_pipeline_set_uniform_1i (priv->pipeline, priv->bend_x_uniform, priv->bend_x);
-}
-
-static void
-shell_wobbly_effect_init (ShellWobblyEffect *self)
-{
-  static CoglPipeline *pipeline_template;
-
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-
-  if (G_UNLIKELY (pipeline_template == NULL))
-    {
-      CoglSnippet *snippet;
-      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-
-      pipeline_template = cogl_pipeline_new (ctx);
-
-      snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP, wobbly_decls, NULL);
-      cogl_snippet_set_pre (snippet, wobbly_pre);
-      cogl_pipeline_add_layer_snippet (pipeline_template, 0, snippet);
-      cogl_object_unref (snippet);
-
-      cogl_pipeline_set_layer_null_texture (pipeline_template,
-                                            0, /* layer number */
-                                            COGL_TEXTURE_TYPE_2D);
-    }
-
-  priv->pipeline = cogl_pipeline_copy (pipeline_template);
-  priv->tex_width_uniform = cogl_pipeline_get_uniform_location (priv->pipeline, "tex_width");
-  priv->bend_x_uniform = cogl_pipeline_get_uniform_location (priv->pipeline, "bend_x");
-
-  update_uniforms (self);
-}
-
-void
-shell_wobbly_effect_set_bend_x (ShellWobblyEffect *self,
-                                int                bend_x)
-{
-  ShellWobblyEffectPrivate *priv = shell_wobbly_effect_get_instance_private (self);
-
-  if (priv->bend_x == bend_x)
-    return;
-
-  priv->bend_x = bend_x;
-  update_uniforms (self);
-  clutter_effect_queue_repaint (CLUTTER_EFFECT (self));
-}

src/shell-wobbly-effect.h

@@ -1,55 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2014 Endless Mobile
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jasper St. Pierre <jstpierre@mecheye.net>
- */
-
-#include <clutter/clutter.h>
-
-#ifndef __SHELL_WOBBLY_EFFECT_H__
-#define __SHELL_WOBBLY_EFFECT_H__
-
-#define SHELL_TYPE_WOBBLY_EFFECT             (shell_wobbly_effect_get_type ())
-#define SHELL_WOBBLY_EFFECT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_WOBBLY_EFFECT, ShellWobblyEffect))
-#define SHELL_WOBBLY_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  SHELL_TYPE_WOBBLY_EFFECT, ShellWobblyEffectClass))
-#define SHELL_IS_WOBBLY_EFFECT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHELL_TYPE_WOBBLY_EFFECT))
-#define SHELL_IS_WOBBLY_EFFECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  SHELL_TYPE_WOBBLY_EFFECT))
-#define SHELL_WOBBLY_EFFECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  SHELL_TYPE_WOBBLY_EFFECT, ShellWobblyEffectClass))
-
-typedef struct _ShellWobblyEffect        ShellWobblyEffect;
-typedef struct _ShellWobblyEffectClass   ShellWobblyEffectClass;
-
-struct _ShellWobblyEffect
-{
-  ClutterOffscreenEffect parent;
-};
-
-struct _ShellWobblyEffectClass
-{
-  ClutterOffscreenEffectClass parent_class;
-};
-
-GType shell_wobbly_effect_get_type (void) G_GNUC_CONST;
-
-void shell_wobbly_effect_set_bend_x (ShellWobblyEffect *self,
-                                     int                bend_x);
-
-#endif /* __SHELL_WOBBLY_EFFECT_H__ */