Merge lp:~unity-team/unity/unity.sprint-fixes into lp:unity

[Gord Allott]

bunch of fixes from the sprint

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'targets/mutter/expose-manager.vala'
--- targets/mutter/expose-manager.vala	2010-07-19 09:12:30 +0000
+++ targets/mutter/expose-manager.vala	2010-07-22 16:19:42 +0000
@@ -25,6 +25,8 @@
     private Clutter.Clone clone;
     private Clutter.Actor darken_box;
     private bool hovered;
+    
+    public bool fade_on_close { get; set; }
 
     public unowned Clutter.Actor source { get; private set; }
 
@@ -48,7 +50,7 @@
       unhovered_opacity = 255;
 
       this.source = source;
-      
+
       if (source is Mutter.Window)
         clone = new Clutter.Clone ((source as Mutter.Window).get_texture ());
       else
@@ -90,6 +92,33 @@
       darken_box.opacity = darken;
       return false;
     }
+
+    public void restore_window_position (int active_workspace)
+    {
+      set_anchor_point_from_gravity (Clutter.Gravity.NORTH_WEST);
+      Clutter.Actor window = source;
+
+      uint8 opacity = 0;
+      if (!fade_on_close || (window is Mutter.Window && (window as Mutter.Window).showing_on_its_workspace () &&
+          (window as Mutter.Window).get_workspace () == active_workspace))
+        opacity = 255;
+
+
+      set ("scale-gravity", Clutter.Gravity.CENTER);
+      Clutter.Animation anim = animate (Clutter.AnimationMode.EASE_IN_OUT_SINE, 250,
+                                         "scale-x", 1f,
+                                         "scale-y", 1f,
+                                         "opacity", opacity,
+                                         "x", window.x,
+                                         "y", window.y);
+
+      window.opacity = 0;
+
+      anim.completed.connect (() => {
+        destroy ();
+        window.opacity = 255;
+      });
+    }
   }
 
   public class ExposeManager : Object
@@ -117,7 +146,6 @@
 
     private ExposeClone? last_selected_clone = null;
 
-    private bool menu_in_hover_close_state = false;
 
     public ExposeManager (Plugin plugin, Launcher.Launcher launcher)
     {
@@ -137,12 +165,6 @@
 
     public void start_expose (SList<Clutter.Actor> windows)
     {
-      var controller = Launcher.QuicklistController.get_current_menu ();
-      if (controller.is_menu_open ())
-        {
-          controller.get_view ().destroy.connect (this.end_expose);
-          this.menu_in_hover_close_state = controller.get_view ().get_close_on_leave ();
-        }
       exposed_windows = new List<ExposeClone> ();
 
       if (expose_group != null)
@@ -164,6 +186,7 @@
             continue;
 
           ExposeClone clone = new ExposeClone (actor);
+          clone.fade_on_close = true;
           clone.set_position (actor.x, actor.y);
           clone.set_size (actor.width, actor.height);
           exposed_windows.append (clone);
@@ -175,26 +198,6 @@
           clone.unhovered_opacity = unhovered_opacity;
           clone.opacity = unhovered_opacity;
           clone.darken = darken;
-
-          clone.enter_event.connect (() => {
-                var ql_controller = Launcher.QuicklistController.get_current_menu ();
-                if (ql_controller.state == Launcher.QuicklistControllerState.MENU
-                    && this.menu_in_hover_close_state)
-                  {
-                    ql_controller.get_view ().set_close_on_leave (false);
-                  }
-                return false;
-              });
-
-          clone.leave_event.connect (() => {
-                var ql_controller = Launcher.QuicklistController.get_current_menu ();
-                if (ql_controller.state == Launcher.QuicklistControllerState.MENU
-                    && this.menu_in_hover_close_state)
-                  {
-                    ql_controller.get_view ().set_close_on_leave (true);
-                  }
-                return false;
-              });
         }
 
       unowned GLib.List<Mutter.Window> mutter_windows = owner.plugin.get_windows ();
@@ -211,7 +214,7 @@
       if (coverflow)
         position_windows_coverflow (exposed_windows, exposed_windows.nth_data (coverflow_index));
       else
-        position_windows_on_grid (exposed_windows);
+        position_windows_on_grid (exposed_windows, top_buffer, left_buffer, right_buffer, bottom_buffer);
 
       expose_showing = true;
 
@@ -223,13 +226,6 @@
     {
       if (!expose_showing)
         return;
-      
-      var controller = Launcher.QuicklistController.get_current_menu ();
-      if (controller.is_menu_open ())
-        {
-          controller.get_view ().destroy.disconnect (this.end_expose);
-          controller.state = Launcher.QuicklistControllerState.CLOSED;
-        }
 
       unowned GLib.List<Mutter.Window> mutter_windows = owner.plugin.get_windows ();
       foreach (Mutter.Window window in mutter_windows)
@@ -249,8 +245,8 @@
           window.reactive = true;
         }
 
-      foreach (Clutter.Actor actor in exposed_windows)
-        restore_window_position (actor);
+      foreach (ExposeClone actor in exposed_windows)
+        actor.restore_window_position (Mutter.MetaScreen.get_active_workspace_index (owner.plugin.get_screen ()));
 
       if (this.last_selected_clone is ExposeClone &&
           this.last_selected_clone.source is Mutter.Window)
@@ -355,7 +351,7 @@
       return 0;
     }
 
-    void position_windows_on_grid (List<Clutter.Actor> _windows)
+    public void position_windows_on_grid (List<Clutter.Actor> _windows, int top_buffer, int left_buffer, int right_buffer, int bottom_buffer)
     {
       List<Clutter.Actor> windows = _windows.copy ();
       windows.sort ((CompareFunc) direct_comparison);
@@ -426,34 +422,6 @@
         }
     }
 
-    private void restore_window_position (Clutter.Actor actor)
-    {
-      if (!(actor is ExposeClone))
-        return;
-
-      actor.set_anchor_point_from_gravity (Clutter.Gravity.NORTH_WEST);
-      Clutter.Actor window = (actor as ExposeClone).source;
-
-      uint8 opacity = 0;
-      if ((window as Mutter.Window).showing_on_its_workspace () &&
-          (window as Mutter.Window).get_workspace () == Mutter.MetaScreen.get_active_workspace_index (owner.plugin.get_screen ()))
-        opacity = 255;
-
-      actor.set ("scale-gravity", Clutter.Gravity.CENTER);
-      Clutter.Animation anim = actor.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE, 250,
-                                         "scale-x", 1f,
-                                         "scale-y", 1f,
-                                         "opacity", opacity,
-                                         "x", window.x,
-                                         "y", window.y);
-
-      window.opacity = 0;
-
-      anim.completed.connect (() => {
-        actor.destroy ();
-        window.opacity = 255;
-      });
-    }
 
     void handle_event_coverflow (Clutter.Event event)
     {
@@ -524,23 +492,13 @@
       if (event.type == Clutter.EventType.ENTER || event.type == Clutter.EventType.LEAVE)
         return false;
 
-      bool event_over_menu = false;
 
       float x, y;
       event.get_coords (out x, out y);
 
       unowned Clutter.Actor actor = this.stage.get_actor_at_pos (Clutter.PickMode.REACTIVE, (int) x, (int) y);
 
-      Clutter.Actor? menu = null;
-      if (Unity.Launcher.QuicklistController.get_current_menu ().is_menu_open ())
-        menu = Unity.Launcher.QuicklistController.get_current_menu ().get_view ();
-      if (menu != null)
-        {
-          if (x > menu.x && x < menu.x + menu.width && y > menu.y && y < menu.y + menu.height)
-            event_over_menu = true;
-        }
-
-      if (event.type == Clutter.EventType.BUTTON_PRESS && !event_over_menu)
+      if (event.type == Clutter.EventType.BUTTON_PRESS)
         pick_window (event, actor);
 
       if (coverflow)
@@ -548,7 +506,7 @@
       else
         handle_event_expose (event, actor);
 
-      return !event_over_menu;
+      return true;
     }
   }
 }
 
=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-07-16 08:43:18 +0000
+++ targets/mutter/plugin.vala	2010-07-22 16:19:42 +0000
@@ -107,6 +107,8 @@
       set { _plugin = value; Idle.add (real_construct); }
     }
 
+    public ExposeManager expose_manager { get; private set; }
+
     public bool menus_swallow_events { get { return false; } }
 
     public bool expose_showing { get { return expose_manager.expose_showing; } }
@@ -121,7 +123,6 @@
 
     /* Unity Components */
     private Background         background;
-    private ExposeManager      expose_manager;
     private SpacesManager      spaces_manager;
     private Launcher.Launcher  launcher;
     private Places.Controller  places_controller;
@@ -243,6 +244,13 @@
       this.spaces_manager = new SpacesManager (this);
       this.spaces_manager.set_padding (50, 50, 125, 50);
 
+      this.launcher.model.add (spaces_manager.button);
+      this.launcher.model.order_changed.connect (() => {
+        var index = launcher.model.index_of (spaces_manager.button);
+        if (index < launcher.model.size)
+          launcher.model.move (spaces_manager.button, launcher.model.size -1);
+      });
+
       this.expose_manager = new ExposeManager (this, launcher);
       this.expose_manager.hovered_opacity = 255;
       this.expose_manager.unhovered_opacity = 255;
@@ -308,7 +316,6 @@
 
     private void on_focus_window_fullscreen_changed ()
     {
-      warning ("FOCUS WINDOW FULLSCREEN CHANGED");
       check_fullscreen_obstruction ();
     }
 
@@ -466,32 +473,6 @@
     /*
      * SHELL IMPLEMENTATION
      */
-
-    /*
-    public void show_window_picker ()
-    {
-      this.show_unity ();
-          return;
-        }
-
-      if (expose_manager.expose_showing == true)
-        {
-          this.dexpose_windows ();
-          return;
-        }
-
-      GLib.SList <Clutter.Actor> windows = null;
-
-      unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
-      foreach (Mutter.Window window in mutter_windows)
-        {
-          windows.append (window as Clutter.Actor);
-        }
-
-      this.expose_windows (windows, 80);
-    }
-    */
-
     public Clutter.Stage get_stage ()
     {
       return this.stage;
@@ -539,7 +520,7 @@
 
     public void stop_expose ()
     {
-      dexpose_windows ();
+      expose_manager.end_expose ();
     }
 
     public void show_window (uint32 xid)
@@ -585,10 +566,6 @@
       expose_manager.start_expose (windows);
     }
 
-    public void dexpose_windows ()
-    {
-      expose_manager.end_expose ();
-    }
 
     public void hide_unity ()
     {
 
=== modified file 'targets/mutter/spaces-manager.vala'
--- targets/mutter/spaces-manager.vala	2010-06-21 21:44:09 +0000
+++ targets/mutter/spaces-manager.vala	2010-07-22 16:19:42 +0000
@@ -17,14 +17,52 @@
  *
  */
  
+using Unity.Launcher;
+ 
 namespace Unity {
   
+  public class SpacesButtonController : ScrollerChildController
+  {
+    SpacesManager parent { get; set; }
+  
+    public SpacesButtonController (SpacesManager _parent, ScrollerChild _child)
+    {
+      Object (child: _child);
+      this.parent = _parent;
+
+      name = "Workspace Overview";
+      load_icon_from_icon_name ("workspace-switcher");
+    }
+  
+    construct
+    {
+    }
+    
+    public override void activate ()
+    {
+      parent.show_spaces_picker ();
+    }
+  }
+  
   public class SpacesManager : GLib.Object
   {
     Clutter.Actor background;
     List<Clutter.Actor> clones;
     Plugin plugin;
     unowned Mutter.MetaScreen screen;
+    ScrollerChild _button;
+    SpacesButtonController controller;
+    
+    public ScrollerChild button {
+      get {
+        if (!(_button is ScrollerChild))
+          {
+            _button = new ScrollerChild ();
+            controller = new SpacesButtonController (this, _button);
+          }
+        return _button;
+      }
+    }
     
     public uint top_padding { get; set; }
     public uint right_padding { get; set; }
@@ -114,17 +152,29 @@
     
     private Clutter.Actor workspace_clone (Mutter.MetaWorkspace workspace) {
       Clutter.Group wsp;
-      unowned GLib.List<Mutter.Window> windows = plugin.plugin.get_windows ();
+      GLib.List<weak Mutter.Window> windows = (GLib.List<weak Mutter.Window>) plugin.plugin.get_windows ().copy ();
       
       wsp = new Clutter.Group ();
       
+      List<Clutter.Actor> toplevel_windows = new List<Clutter.Actor> ();
+      
+      int active_workspace = Mutter.MetaScreen.get_active_workspace_index (plugin.plugin.get_screen ());
+
+      Clutter.Actor last = null, wspclone = null;
+      
       foreach (Mutter.Window window in windows)
         {
           if (Mutter.MetaWindow.is_on_all_workspaces (window.get_meta_window ()) ||
               window.get_window_type () == Mutter.MetaCompWindowType.DESKTOP ||
               window.get_workspace () == Mutter.MetaWorkspace.index (workspace))
             {
-              Clutter.Actor clone = new Clutter.Clone (window);
+            
+              if (window.get_window_type () == Mutter.MetaCompWindowType.DOCK)
+                continue;
+            
+              ExposeClone clone = new ExposeClone (window);
+              clone.fade_on_close = false;
+              
               wsp.add_actor (clone);
           
               clone.set_size (window.width, window.height);
@@ -134,10 +184,21 @@
               
               if (window.get_window_type () == Mutter.MetaCompWindowType.DESKTOP)
                 {
+                  wspclone = clone;
                   clone.lower_bottom ();
                 }
+              else
+                {
+                  last = clone;
+                  toplevel_windows.prepend (clone);
+                }
             }
         }
+        
+      if (last != null && wspclone != null && active_workspace != Mutter.MetaWorkspace.index (workspace))
+        last.raise (wspclone);
+      
+      plugin.expose_manager.position_windows_on_grid (toplevel_windows, 50, 50, 50, 50);
       
       return wsp;
     }
@@ -170,6 +231,11 @@
                       "scale-x", 1.0f,
                       "scale-y", 1.0f);
               
+              int active_workspace = Mutter.MetaScreen.get_active_workspace_index (plugin.plugin.get_screen ());
+              foreach (Clutter.Actor actor in (clone as Clutter.Group).get_children ())
+                if (actor is ExposeClone)
+                  (actor as ExposeClone).restore_window_position (active_workspace);
+              
               anim.completed.connect (() => {
                 clone.destroy ();
                 if (background != null)
 
=== modified file 'tests/unit/test-launcher.vala'
--- tests/unit/test-launcher.vala	2010-07-15 13:19:02 +0000
+++ tests/unit/test-launcher.vala	2010-07-22 16:19:42 +0000
@@ -141,9 +141,6 @@
 
   public class TestScrollerChild : ScrollerChild
     {
-      public override void force_rotation_jump (float degrees)
-      {
-      }
     }
 
   public class LauncherSuite
 
=== modified file 'unity-private/Makefile.am'
--- unity-private/Makefile.am	2010-07-16 08:43:18 +0000
+++ unity-private/Makefile.am	2010-07-22 16:19:42 +0000
@@ -105,7 +105,6 @@
 launcher_sources = \
   launcher/application-controller.vala \
   launcher/launcher.vala \
-  launcher/launcher-child.vala \
   launcher/quicklist-check-menu-item.vala \
   launcher/quicklist-controller.vala \
   launcher/quicklist-image-menu-item.vala \
 
=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-07-22 09:06:10 +0000
+++ unity-private/launcher/application-controller.vala	2010-07-22 16:19:42 +0000
@@ -33,7 +33,6 @@
 
     private KeyFile desktop_keyfile;
     private string icon_name;
-    private Unity.ThemeFilePath theme_file_path;
     private Bamf.Application? app = null;
     private Dbusmenu.Client menu_client;
     private Dbusmenu.Menuitem cached_menu;
@@ -58,25 +57,16 @@
 
     construct
     {
-      theme_file_path = new Unity.ThemeFilePath ();
       var favorites = Unity.Favorites.get_default ();
       favorites.favorite_added.connect (on_favorite_added);
       favorites.favorite_removed.connect (on_favorite_removed);
 
-      // we need to figure out if we are a favorite
-      is_favorite = true;
+      // we need to figure out if we are a favoritem
+
+      is_favorite = is_sticky ();
       child.pin_type = PinType.UNPINNED;
-      foreach (string uid in favorites.get_favorites ())
-        {
-          if (favorites.get_string (uid, "desktop_file") == desktop_file)
-            {
-              is_favorite = true;
-              child.pin_type = PinType.PINNED;
-              break;
-            }
-        }
-
-      notify["menu"].connect (on_notify_menu);
+      if (is_sticky ())
+        child.pin_type = PinType.PINNED;
     }
 
     public override QuicklistController get_menu_controller ()
@@ -85,28 +75,19 @@
       return new_menu;
     }
 
-    private void on_notify_menu ()
-    {
-      menu.notify["state"].connect (() => {
-        if (menu.state == QuicklistControllerState.MENU)
-          {
-            Unity.global_shell.expose_xids (app.get_xids ());
-          }
-        else
-          {
-            Unity.global_shell.stop_expose ();
-          }
-      });
-    }
-
     public void set_sticky (bool is_sticky = true)
     {
       if (desktop_file == "" || desktop_file == null)
         return;
-      //string uid = "app-" + Path.get_basename (desktop_file);
+
       var favorites = Unity.Favorites.get_default ();
 
       string uid = favorites.find_uid_for_desktop_file (desktop_file);
+      if (uid == "" || uid == null)
+        {
+          var filepath = desktop_file.split ("/");
+          uid = "app-" + filepath[filepath.length - 1];
+        }
 
       if (is_sticky)
         {
@@ -127,10 +108,10 @@
 
       var favorites = Unity.Favorites.get_default ();
       string uid = favorites.find_uid_for_desktop_file (desktop_file);
-      if (uid != null && uid != "")
+      if (uid == null || uid == "")
+        return false;
+      else
         return true;
-      else
-        return false;
     }
 
     public void close_windows ()
@@ -188,15 +169,17 @@
         }
     }
 
+/*
+    private get_menu_for_client (ScrollerChildController.menu_cb callback, Dbusmenu.Client client)
+    {
+
+    }
+*/
+
     public override void get_menu_actions (ScrollerChildController.menu_cb callback)
     {
 
       // first check to see if we have a cached client, if we do, just re-use that
-      if (menu_client is Dbusmenu.Client && cached_menu is Dbusmenu.Menuitem)
-        {
-          callback (cached_menu);
-        }
-
       // check for a menu from bamf
       if (app is Bamf.Application)
         {
@@ -279,13 +262,19 @@
       Dbusmenu.Menuitem root = new Dbusmenu.Menuitem ();
       root.set_root (true);
 
-      if (desktop_file != null)
+      if (desktop_file != null && desktop_file != "")
         {
           Dbusmenu.Menuitem pinning_item = new Dbusmenu.Menuitem ();
-          if (is_sticky ())
-            pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Remove from launcher"));
-          else
-            pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Add to launcher"));
+          if (is_sticky () && app is Bamf.Application)
+            {
+              pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Keep in Launcher"));
+              pinning_item.property_set (Dbusmenu.MENUITEM_PROP_TOGGLE_TYPE, Dbusmenu.MENUITEM_TOGGLE_CHECK);
+              pinning_item.property_set_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE, Dbusmenu.MENUITEM_TOGGLE_STATE_CHECKED);
+            }
+          else if (is_sticky ())
+            {
+              pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Remove from launcher"));
+            }
 
           pinning_item.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
           pinning_item.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
@@ -317,6 +306,8 @@
     }
 
     private static int order_app_windows (void* a, void* b)
+      requires (a is Bamf.Window)
+      requires (b is Bamf.Window)
     {
       if ((b as Bamf.Window).last_active () > (a as Bamf.Window).last_active ())
         {
@@ -337,7 +328,12 @@
 
       if (app is Bamf.Application)
         {
-          if (app.is_running ())
+          if (app.is_active ())
+            {
+              Array<uint32> xids = app.get_xids ();
+              global_shell.expose_xids (xids);
+            }
+          else if (app.is_running ())
             {
               unowned List<Bamf.Window> windows = app.get_windows ();
               windows.sort ((CompareFunc)order_app_windows);
@@ -375,7 +371,7 @@
     public void attach_application (Bamf.Application application)
     {
       app = application;
-      desktop_file = app.get_desktop_file ();
+      desktop_file = app.get_desktop_file ().dup ();
       child.running = app.is_running ();
       child.active = app.is_active ();
       child.activating = false;
@@ -384,12 +380,15 @@
       app.active_changed.connect (on_app_active_changed);
       app.closed.connect (detach_application);
       app.urgent_changed.connect (on_app_urgant_changed);
+      app.user_visible_changed.connect ((value) => {
+        hide = !value;
+      });
       name = app.get_name ();
       if (name == null || name == "")
         warning (@"Bamf returned null for app.get_name (): $desktop_file");
 
       icon_name = app.get_icon ();
-      load_icon_from_icon_name ();
+      load_icon_from_icon_name (icon_name);
     }
 
     public void detach_application ()
@@ -444,7 +443,7 @@
       try
         {
           icon_name = desktop_keyfile.get_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_ICON);
-          load_icon_from_icon_name ();
+          load_icon_from_icon_name (icon_name);
         }
       catch (Error e)
         {
@@ -468,86 +467,5 @@
         {
         }
     }
-
-    /* all this icon loading stuff can go when we switch from liblauncher to
-     * bamf - please ignore any icon loading bugs :-)
-     */
-    private void load_icon_from_icon_name ()
-    {
-      // first try to load from a path;
-      if (try_load_from_file (icon_name))
-        {
-          return;
-        }
-
-      //try to load from a path that we augment
-      if (try_load_from_file ("/usr/share/pixmaps/" + icon_name))
-        {
-          return;
-        }
-
-      theme_file_path = new Unity.ThemeFilePath ();
-
-      // add our searchable themes
-      Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
-      theme_file_path.add_icon_theme (theme);
-      theme = new Gtk.IconTheme ();
-
-      theme.set_custom_theme ("unity-icon-theme");
-      theme_file_path.add_icon_theme (theme);
-      theme.set_custom_theme ("Web");
-      theme_file_path.add_icon_theme (theme);
-
-      theme_file_path.found_icon_path.connect ((theme, filepath) => {
-        try
-          {
-            child.icon = new Gdk.Pixbuf.from_file (filepath);
-          }
-        catch (Error e)
-          {
-            warning (@"Could not load from $filepath");
-          }
-      });
-      theme_file_path.failed.connect (() => {
-        // we didn't get an icon, so just load the failcon
-        try
-          {
-            var default_theme = Gtk.IconTheme.get_default ();
-            child.icon = default_theme.load_icon(Gtk.STOCK_MISSING_IMAGE, 48, 0);
-          }
-        catch (Error e)
-          {
-            warning (@"Could not load any icon for %s", app.get_name ());
-          }
-      });
-
-      theme_file_path.get_icon_filepath (icon_name);
-    }
-
-    private bool try_load_from_file (string filepath)
-    {
-      Gdk.Pixbuf pixbuf = null;
-      if (FileUtils.test(filepath, FileTest.IS_REGULAR))
-        {
-          try
-            {
-              pixbuf = new Gdk.Pixbuf.from_file_at_scale(filepath,
-                                                         48, 48, true);
-            }
-          catch (Error e)
-            {
-              warning ("Unable to load image from file '%s': %s",
-                       filepath,
-                       e.message);
-            }
-
-          if (pixbuf is Gdk.Pixbuf)
-            {
-              child.icon = pixbuf;
-              return true;
-            }
-        }
-      return false;
-    }
   }
 }
 
=== removed file 'unity-private/launcher/launcher-child.vala'
--- unity-private/launcher/launcher-child.vala	2010-06-22 13:18:52 +0000
+++ unity-private/launcher/launcher-child.vala	1970-01-01 00:00:00 +0000
@@ -1,571 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Gordon Allott <[e-mail]>
- *
- */
-
-namespace Unity.Launcher
-{
-  const string HONEYCOMB_MASK_FILE = Unity.PKGDATADIR
-    + "/honeycomb-mask.png";
-  const string MENU_BG_FILE = Unity.PKGDATADIR
-    + "/tight_check_4px.png";
-
-  const float WIGGLE_SIZE = 5; // how many degree's to wiggle on either side.
-  const int WIGGLE_FREQUENCY = 5; // x times a second
-  const int WIGGLE_RUN_LENGTH = 5000; // 5 seconds of wiggle
-  const int WIGGLE_PAUSE_LENGTH = 20; // followed by 20 seconds of no wiggle
-
-  private enum AnimState {
-    RISING,
-    LOOPING,
-    FALLING,
-    STOPPED
-  }
-
-
-  class LauncherChild : ScrollerChild
-  {
-    private UnityIcon processed_icon;
-    private ThemeImage active_indicator;
-    private ThemeImage running_indicator;
-    private Gdk.Pixbuf honeycomb_mask;
-
-    // effects
-    private Ctk.EffectDropShadow effect_drop_shadow;
-    private Ctk.EffectGlow effect_icon_glow;
-
-    // animations
-    private Clutter.Animation active_indicator_anim;
-    private Clutter.Animation running_indicator_anim;
-    private Clutter.Animation rotate_anim;
-    private Clutter.Timeline  wiggle_timeline;
-    private Clutter.Timeline  glow_timeline;
-    private Clutter.Timeline  rotate_timeline;
-    private AnimState glow_state;
-    private AnimState wiggle_state;
-    private AnimState rotate_state;
-
-    private float old_rotate_value = 0.0f;
-
-    construct
-    {
-      load_textures ();
-      position = 0.0f;
-
-      //icon glow
-      glow_timeline = new Clutter.Timeline (1);
-      wiggle_timeline = new Clutter.Timeline (1);
-      rotate_timeline = new Clutter.Timeline (1);
-
-      glow_timeline.new_frame.connect (on_glow_timeline_new_frame);
-      wiggle_timeline.new_frame.connect (on_wiggle_timeline_new_frame);
-      rotate_timeline.new_frame.connect (on_rotate_timeline_new_frame);
-
-      notify["rotation"].connect (on_rotation_changed);
-    }
-
-    ~LauncherChild ()
-    {
-      running_indicator.unparent ();
-      active_indicator.unparent ();
-    }
-
-    /* private methods */
-    private void load_textures ()
-    {
-      active_indicator = new ThemeImage ("application-selected");
-      running_indicator = new ThemeImage ("application-running");
-
-      active_indicator.set_parent (this);
-      running_indicator.set_parent (this);
-      active_indicator.set_opacity (0);
-      running_indicator.set_opacity (0);
-
-      try
-        {
-          honeycomb_mask = new Gdk.Pixbuf.from_file(HONEYCOMB_MASK_FILE);
-        }
-      catch (Error e)
-        {
-          warning ("Unable to load asset %s: %s",
-                   HONEYCOMB_MASK_FILE,
-                   e.message);
-        }
-
-        processed_icon = new UnityIcon (null, null);
-        processed_icon.set_size (48, 48);
-        processed_icon.set_parent (this);
-
-        notify["icon"].connect (on_icon_changed);
-        notify["running"].connect (on_running_changed);
-        notify["active"].connect (on_active_changed);
-        notify["activating"].connect (on_activating_changed);
-        notify["needs-attention"].connect (on_needs_attention_changed);
-
-        // just trigger some notifications now to set inital state
-        on_running_changed ();
-        on_active_changed ();
-        on_rotation_changed ();
-    }
-
-    /* alpha helpers */
-    private static float get_ease_out_sine (float alpha)
-    {
-      return (float)(Math.sin ((Math.PI_2 * alpha)));
-    }
-
-    private static float get_circular_alpha (float alpha)
-    {
-      //float sine = (float)(Math.sin (-Math.PI + (alpha * (Math.PI * 2))));
-      var sine = Math.sin ((alpha * (Math.PI * 2)) - Math.PI);
-      return Math.fmaxf(((float)sine / 2.0f) + 0.5f, 0.0f);;
-    }
-    /* animation callbacks */
-
-    private void on_rotate_timeline_new_frame ()
-    {
-      float progress = (float)rotate_timeline.get_progress ();
-      switch (rotate_state)
-        {
-          case AnimState.RISING:
-            rotate_anim_rising (progress);
-            break;
-
-          case AnimState.STOPPED:
-            rotate_timeline.stop ();
-            break;
-        }
-      processed_icon.do_queue_redraw ();
-    }
-
-    private void rotate_anim_rising (float progress)
-    {
-      progress = get_ease_out_sine (progress);
-      var diff = rotation - old_rotate_value;
-      float rotate_val = old_rotate_value + (progress * diff);
-
-      processed_icon.rotation = rotate_val;
-      if (progress >= 1.0)
-        {
-          rotate_state = AnimState.STOPPED;
-          rotate_timeline.stop ();
-        }
-    }
-
-    public override void force_rotation_jump (float degrees)
-    {
-      processed_icon.rotation = degrees;
-      rotation = degrees;
-      rotate_state = AnimState.STOPPED;
-      rotate_timeline.stop ();
-      do_queue_redraw ();
-    }
-
-    private void on_glow_timeline_new_frame ()
-    {
-      float progress = (float)glow_timeline.get_progress ();
-      switch (glow_state)
-        {
-          case AnimState.RISING:
-            glow_anim_rising (progress);
-            break;
-
-          case AnimState.LOOPING:
-            glow_anim_looping (progress);
-            break;
-
-          case AnimState.FALLING:
-            glow_anim_falling (progress);
-            break;
-
-          default:
-            glow_state = AnimState.STOPPED;
-            glow_timeline.stop ();
-            break;
-        }
-
-      processed_icon.do_queue_redraw ();
-    }
-
-    private float previous_glow_alpha = 0.0f;
-    private void glow_anim_rising (float progress)
-    {
-      progress = get_ease_out_sine (progress);
-      effect_icon_glow.set_opacity (progress);
-      previous_glow_alpha = progress;
-      if (progress >= 1.0)
-        {
-          glow_state = AnimState.LOOPING;
-          glow_timeline.stop ();
-          glow_timeline.set_duration (LONG_DELAY);
-          glow_timeline.set_loop (true);
-          glow_timeline.start ();
-          return;
-        }
-    }
-
-    private void glow_anim_looping (float progress)
-    {
-      progress = 1.0f - get_circular_alpha (progress);
-      effect_icon_glow.set_opacity (progress);
-      previous_glow_alpha = progress;
-      processed_icon.do_queue_redraw ();
-    }
-
-    private void glow_anim_falling (float progress)
-    {
-      float alpha_length = previous_glow_alpha;
-      effect_icon_glow.set_opacity (alpha_length - (progress * alpha_length));
-
-      if (progress >= 1.0)
-        {
-          glow_state = AnimState.STOPPED;
-          glow_timeline.stop ();
-          glow_timeline.set_loop (false);
-        }
-    }
-
-    private void on_wiggle_timeline_new_frame ()
-    {
-      float progress = (float)wiggle_timeline.get_progress ();
-
-      switch (wiggle_state)
-        {
-          case AnimState.RISING:
-            wiggle_anim_rising (progress);
-            break;
-
-          case AnimState.LOOPING:
-            wiggle_anim_looping (progress);
-            break;
-
-          case AnimState.FALLING:
-            wiggle_anim_falling (progress);
-            break;
-
-          default:
-            wiggle_state = AnimState.STOPPED;
-            wiggle_timeline.stop ();
-            break;
-        }
-
-      processed_icon.do_queue_redraw ();
-    }
-
-    private float previous_wiggle_alpha = 0.0f;
-    private void wiggle_anim_rising (float progress)
-    {
-      progress = get_ease_out_sine (progress);
-      processed_icon.set_rotation (Clutter.RotateAxis.Z_AXIS, progress * WIGGLE_SIZE,
-                                   25.0f, 25.0f, 0.0f);
-      previous_wiggle_alpha = progress;
-      if (progress >= 1.0)
-        {
-          wiggle_state = AnimState.LOOPING;
-          wiggle_timeline.stop ();
-          wiggle_timeline.set_duration (WIGGLE_RUN_LENGTH);
-          wiggle_timeline.set_loop (true);
-          wiggle_timeline.start ();
-          return;
-        }
-    }
-
-    private void wiggle_anim_looping (float progress)
-    {
-      if (progress >= 1.0)
-        {
-          wiggle_state = AnimState.FALLING;
-          wiggle_timeline.stop ();
-          wiggle_timeline.set_loop (false);
-          wiggle_timeline.start ();
-        }
-
-      int frequency = WIGGLE_FREQUENCY * (WIGGLE_RUN_LENGTH / 1000);
-      progress = get_circular_alpha (Math.fmodf (progress * frequency, 1.0f));
-      progress = (1.0f - progress) * 2.0f - 1.0f;
-      processed_icon.set_rotation (Clutter.RotateAxis.Z_AXIS, progress * WIGGLE_SIZE,
-                                   25.0f, 25.0f, 0.0f);
-      processed_icon.do_queue_redraw ();
-      previous_wiggle_alpha = progress;
-
-
-    }
-
-    private bool check_continue_wiggle ()
-    {
-      if (needs_attention)
-        {
-          wiggle_timeline.set_duration (500 / WIGGLE_FREQUENCY);
-          wiggle_state = AnimState.RISING;
-          wiggle_timeline.start ();
-        }
-      return false;
-    }
-
-    private void wiggle_anim_falling (float progress)
-    {
-      float alpha_length = previous_wiggle_alpha;
-      float angle = alpha_length - (progress * alpha_length);
-      processed_icon.set_rotation (Clutter.RotateAxis.Z_AXIS, angle,
-                                   25.0f, 25.0f, 0.0f);
-
-      if (progress >= 1.0)
-        {
-          wiggle_state = AnimState.STOPPED;
-          wiggle_timeline.stop ();
-          wiggle_timeline.set_loop (false);
-          GLib.Timeout.add_seconds (WIGGLE_PAUSE_LENGTH, check_continue_wiggle);
-        }
-    }
-
-    /* notifications */
-    private void on_icon_changed ()
-    {
-      if (icon is Gdk.Pixbuf)
-        {
-          Gdk.Pixbuf scaled_buf;
-          int max_size = 48;
-          if (!Unity.pixbuf_is_tile (icon))
-            max_size = 40;
-
-          if (icon.get_width () > max_size || icon.get_height () > max_size)
-            {
-              scaled_buf = icon.scale_simple (max_size, max_size, Gdk.InterpType.HYPER);
-            }
-          else
-            {
-              scaled_buf = icon;
-            }
-
-          Gdk.Pixbuf color_buf = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, 1, 1);
-          uint red, green, blue;
-          Unity.get_average_color (scaled_buf, out red, out green, out blue);
-          unowned uchar[] pixels = color_buf.get_pixels ();
-          pixels[0] = (uchar)red;
-          pixels[1] = (uchar)green;
-          pixels[2] = (uchar)blue;
-          pixels[3] = 255;
-
-          var tex = GtkClutter.texture_new_from_pixbuf (scaled_buf);
-          var color = GtkClutter.texture_new_from_pixbuf (color_buf);
-
-          processed_icon = new UnityIcon (tex as Clutter.Texture, color as Clutter.Texture);
-          processed_icon.set_parent (this);
-          processed_icon.rotation = rotation;
-
-          this.effect_drop_shadow = new Ctk.EffectDropShadow (5.0f, 0, 2);
-          effect_drop_shadow.set_opacity (0.4f);
-          this.effect_drop_shadow.set_margin (5);
-          this.processed_icon.add_effect (effect_drop_shadow);
-
-          do_queue_redraw ();
-        }
-    }
-
-    private void on_running_changed ()
-    {
-      uint target_opacity = 0;
-      if (running)
-        target_opacity = 255;
-
-      if (running_indicator_anim is Clutter.Animation)
-        running_indicator_anim.completed ();
-
-      running_indicator_anim = running_indicator.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE,
-                                                          SHORT_DELAY,
-                                                          "opacity", target_opacity);
-    }
-
-    private void on_active_changed ()
-    {
-      uint target_opacity = 0;
-      if (active)
-        target_opacity = 255;
-
-      if (active_indicator_anim is Clutter.Animation)
-        active_indicator_anim.completed ();
-      active_indicator_anim = active_indicator.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE,
-                                                        SHORT_DELAY,
-                                                        "opacity", target_opacity);
-    }
-
-    private void on_rotation_changed ()
-    {
-      old_rotate_value = processed_icon.rotation;
-
-      if (rotate_timeline is Clutter.Timeline == false)
-        return;
-
-      if (rotate_timeline.is_playing ())
-        {
-          rotate_timeline.stop ();
-          processed_icon.rotation = old_rotate_value;
-        }
-
-      rotate_timeline.set_duration (300);
-      rotate_state = AnimState.RISING;
-      rotate_timeline.start ();
-    }
-
-    private void on_activating_changed ()
-    {
-      if (glow_timeline.is_playing () && activating == false)
-        {
-          glow_timeline.stop ();
-          glow_timeline.set_duration (SHORT_DELAY);
-          glow_state = AnimState.FALLING;
-          glow_timeline.start ();
-        }
-      else if (glow_timeline.is_playing () == false && activating)
-        {
-          effect_icon_glow = new Ctk.EffectGlow ();
-          Clutter.Color c = Clutter.Color () {
-            red = 255,
-            green = 255,
-            blue = 255,
-            alpha = 255
-          };
-          effect_icon_glow.set_background_texture (honeycomb_mask);
-          effect_icon_glow.set_color (c);
-          effect_icon_glow.set_opacity (1.0f);
-          processed_icon.add_effect (effect_icon_glow);
-          effect_icon_glow.set_margin (6);
-
-          glow_timeline.set_duration (SHORT_DELAY);
-          glow_state = AnimState.RISING;
-          glow_timeline.start ();
-        }
-    }
-
-    private void on_needs_attention_changed ()
-    {
-      if (needs_attention && wiggle_timeline.is_playing () == false)
-        {
-          //start wiggling
-          wiggle_timeline.set_duration (500 / WIGGLE_FREQUENCY);
-          wiggle_state = AnimState.RISING;
-          wiggle_timeline.start ();
-        }
-      else if (needs_attention == false && wiggle_timeline.is_playing ())
-        {
-          //stop wiggling
-          wiggle_timeline.stop ();
-          wiggle_timeline.set_duration (500 / WIGGLE_FREQUENCY);
-          wiggle_state = AnimState.FALLING;
-          wiggle_timeline.start ();
-        }
-    }
-
-    /* clutter overrides */
-    public override void get_preferred_width (float for_height,
-                                                out float minimum_width,
-                                                out float natural_width)
-    {
-      float nat, min;
-      processed_icon.get_preferred_width (for_height, out min, out nat);
-      natural_width = nat;
-      minimum_width = min;
-
-      running_indicator.get_preferred_width (for_height, out min, out nat);
-      natural_width += nat;
-
-      active_indicator.get_preferred_width (for_height, out min, out nat);
-      natural_width += nat;
-    }
-
-    public override void get_preferred_height (float for_width,
-                                               out float minimum_height,
-                                               out float natural_height)
-    {
-      natural_height = 48;
-      minimum_height = 48;
-    }
-
-    public override void allocate (Clutter.ActorBox box, Clutter.AllocationFlags flags)
-    {
-      float x, y;
-      x = 0;
-      y = 0;
-      base.allocate (box, flags);
-
-      Clutter.ActorBox child_box = Clutter.ActorBox ();
-
-      //allocate the running indicator first
-      float width, height, n_width, n_height;
-      running_indicator.get_preferred_width (58, out n_width, out width);
-      running_indicator.get_preferred_height (58, out n_height, out height);
-      child_box.x1 = 0;
-      child_box.y1 = (box.get_height () - height) / 2.0f;
-      child_box.x2 = child_box.x1 + width;
-      child_box.y2 = child_box.y1 + height;
-      running_indicator.allocate (child_box, flags);
-      x += child_box.get_width ();
-
-      //allocate the icon
-      processed_icon.get_preferred_width (48, out width, out n_width);
-      processed_icon.get_preferred_height (48, out height, out n_height);
-      child_box.x1 = (box.get_width () - width) / 2.0f;
-      child_box.y1 = y;
-      child_box.x2 = child_box.x1 + 48;
-      child_box.y2 = child_box.y1 + height;
-      processed_icon.allocate (child_box, flags);
-
-      //allocate the active indicator
-      active_indicator.get_preferred_width (48, out n_width, out width);
-      active_indicator.get_preferred_height (48, out n_height, out height);
-      child_box.x1 = box.get_width () - width;
-      child_box.y1 = (box.get_height () - height) / 2.0f;
-      child_box.x2 = child_box.x1 + width;
-      child_box.y2 = child_box.y1 + height;
-      active_indicator.allocate (child_box, flags);
-
-    }
-
-    public override void pick (Clutter.Color color)
-    {
-      base.pick (color);
-    }
-
-    public override void paint ()
-    {
-      active_indicator.paint ();
-      running_indicator.paint ();
-
-      processed_icon.paint ();
-    }
-
-    public override void map ()
-    {
-      base.map ();
-      running_indicator.map ();
-      active_indicator.map ();
-      processed_icon.map ();
-    }
-
-    public override void unmap ()
-    {
-      base.unmap ();
-      running_indicator.unmap ();
-      active_indicator.unmap ();
-      processed_icon.unmap ();
-    }
-  }
-}
-
-
-
 
=== modified file 'unity-private/launcher/launcher.vala'
--- unity-private/launcher/launcher.vala	2010-04-26 13:47:08 +0000
+++ unity-private/launcher/launcher.vala	2010-07-22 16:19:42 +0000
@@ -33,9 +33,10 @@
   public class Launcher : Object
   {
     public Shell shell {get; construct;}
+    public ScrollerModel model { get; private set; }
+
     private ScrollerController controller;
     private ScrollerView view;
-    private ScrollerModel model;
 
     public Launcher (Shell shell)
     {
 
=== modified file 'unity-private/launcher/quicklist-controller.vala'
--- unity-private/launcher/quicklist-controller.vala	2010-07-16 15:50:39 +0000
+++ unity-private/launcher/quicklist-controller.vala	2010-07-22 16:19:42 +0000
@@ -36,6 +36,9 @@
       get { return _state; }
       set
         {
+          var drag_controller = Unity.Drag.Controller.get_default ();
+          if (drag_controller.is_dragging) value = QuicklistControllerState.CLOSED;
+
           if (value == QuicklistControllerState.LABEL ||
               value == QuicklistControllerState.MENU)
             {
@@ -95,7 +98,6 @@
 
   }
 
-
   public class ApplicationQuicklistController : QuicklistController
   {
     public ApplicationQuicklistController (ScrollerChildController scroller_child)
@@ -111,6 +113,11 @@
       new_menu ();
       notify["state"].connect (on_state_change);
       state = QuicklistControllerState.LABEL;
+
+      var drag_controller = Unity.Drag.Controller.get_default ();
+      drag_controller.drag_start.connect (() => {
+        state = QuicklistControllerState.CLOSED;
+      });
     }
 
     private void new_menu ()
 
=== modified file 'unity-private/launcher/scroller-controller.vala'
--- unity-private/launcher/scroller-controller.vala	2010-07-15 13:19:02 +0000
+++ unity-private/launcher/scroller-controller.vala	2010-07-22 16:19:42 +0000
@@ -76,37 +76,34 @@
           Bamf.Application app = object as Bamf.Application;
           // need to hook up to its visible changed signals
 
-          // this is wrong as it will never re-hide a window
-          app.user_visible_changed.connect ((a, changed) => {
-            if (changed)
-              {
-                handle_bamf_view_opened (a as Object);
-              }
-          });
-
-          if (app.user_visible ())
-            {
-              string desktop_file = app.get_desktop_file ();
-
-              ScrollerChildController controller = null;
-              if (desktop_file != null && desktop_file != "")
-                {
-                  controller = find_controller_by_desktop_file (desktop_file);
-                }
-
-              if (controller is ApplicationController)
-                {
-                  (controller as ApplicationController).attach_application (app);
-                }
-              else
-                {
-                  LauncherChild child = new LauncherChild ();
-                  controller = new ApplicationController (null, child);
-                  (controller as ApplicationController).attach_application (app);
-                  model.add (child);
-                  childcontrollers.add (controller);
-                  controller.closed.connect (on_scroller_controller_closed);
-                }
+          string desktop_file = app.get_desktop_file ();
+
+          ScrollerChildController controller = null;
+          if (desktop_file != null && desktop_file != "")
+            {
+              controller = find_controller_by_desktop_file (desktop_file);
+            }
+
+          if (controller is ApplicationController)
+            {
+              (controller as ApplicationController).attach_application (app);
+            }
+          else
+            {
+              ScrollerChild child = new ScrollerChild ();
+              controller = new ApplicationController (null, child);
+              (controller as ApplicationController).attach_application (app);
+              if (app.user_visible ())
+                model.add (child);
+
+              childcontrollers.add (controller);
+              controller.closed.connect (on_scroller_controller_closed);
+              controller.notify["hide"].connect (() => {
+                if (controller.hide && controller.child in model)
+                  model.remove (controller.child);
+                if (!controller.hide && (controller.child in model) == false)
+                  model.add (controller.child);
+              });
             }
         }
     }
@@ -115,7 +112,7 @@
     {
       if (controller is ApplicationController)
         {
-          if (controller.child.pin_type == PinType.UNPINNED)
+          if (!(controller as ApplicationController).is_sticky ())
             {
               model.remove (controller.child);
               childcontrollers.remove (controller);
@@ -174,7 +171,7 @@
           ApplicationController controller = find_controller_by_desktop_file (desktop_file);
           if (!(controller is ScrollerChildController))
             {
-              LauncherChild child = new LauncherChild ();
+              ScrollerChild child = new ScrollerChild ();
               controller = new ApplicationController (desktop_file, child);
               model.add (child);
               childcontrollers.add (controller);
@@ -199,7 +196,7 @@
       ApplicationController controller = find_controller_by_desktop_file (desktop_file);
       if (!(controller is ScrollerChildController))
         {
-          LauncherChild child = new LauncherChild ();
+          ScrollerChild child = new ScrollerChild ();
           controller = new ApplicationController (desktop_file, child);
           model.add (child);
           childcontrollers.add (controller);
@@ -267,8 +264,17 @@
       }
     }
 
+    float last_drag_x = 0.0f;
+    float last_drag_y = 0.0f;
     private void on_unity_drag_motion (Drag.Model drag_model, float x, float y)
     {
+      if (x == last_drag_x && y == last_drag_y)
+        return;
+
+      last_drag_x = x;
+      last_drag_y = y;
+
+
       var drag_controller = Drag.Controller.get_default ();
       // check to see if the data matches any of our children
       if (!(drag_controller.get_drag_model () is ScrollerChildController))
@@ -286,13 +292,40 @@
         {
           // if the actor is not in the model, add it. because its now in there!
           // find the index at this position
-          int model_index = view.get_model_index_at_y_pos (y);
-          if (retcont in model)
-            model.move (retcont, int.max (model_index, 0));
+          int model_index = view.get_model_index_at_y_pos_no_anim (y, true);
+          if (model_index < 0) return;
+
+          //we have to check to see if we would still be over the index
+          //if it was done animating
+/*
+          GLib.Value value = Value (typeof (float));
+          var child = model[model_index];
+          Clutter.Animation anim = child.get_animation ();
+          if (anim is Clutter.Animation)
+            {
+              debug ("is animating");
+              Clutter.Interval interval = anim.get_interval ("position");
+              interval.get_final_value (value);
+            }
           else
-            model.insert (retcont, int.max (model_index, 0));
-
-          view.do_queue_redraw ();
+            {
+              debug ("is not animating");
+              value.set_float (y);
+            }
+
+          debug ("%f", Math.fabsf (value.get_float () - y));
+
+          if (Math.fabsf (value.get_float () - y) < 48)
+            {
+              debug ("moving things");
+*/
+              if (retcont in model)
+                model.move (retcont, int.max (model_index, 0));
+              else
+                model.insert (retcont, int.max (model_index, 0));
+
+              view.do_queue_redraw ();
+            //}
         }
     }
 
 
=== modified file 'unity-private/launcher/scroller-model.vala'
--- unity-private/launcher/scroller-model.vala	2010-06-16 12:42:46 +0000
+++ unity-private/launcher/scroller-model.vala	2010-07-22 16:19:42 +0000
@@ -94,6 +94,7 @@
 
     public void add (ScrollerChild child)
     {
+      warning ("Add Icon: %s", child.to_string ());
       children.add (child);
       child_added (child);
       order_changed ();
 
=== modified file 'unity-private/launcher/scroller-view.vala'
--- unity-private/launcher/scroller-view.vala	2010-07-19 13:06:02 +0000
+++ unity-private/launcher/scroller-view.vala	2010-07-22 16:19:42 +0000
@@ -156,7 +156,35 @@
       });
     }
 
-    public int get_model_index_at_y_pos (float y)
+    public int get_model_index_at_y_pos_no_anim (float y, bool return_minus_if_fail=false)
+    {
+      SList<float?> positions = new SList<float?> ();
+      foreach (ScrollerChild child in model)
+        {
+          positions.append (child.position);
+          GLib.Value value = Value (typeof (float));
+          Clutter.Animation anim = child.get_animation ();
+          if (anim is Clutter.Animation)
+            {
+              Clutter.Interval interval = anim.get_interval ("position");
+              interval.get_final_value (value);
+              child.position = value.get_float ();
+            }
+        }
+
+        int value = get_model_index_at_y_pos (y, return_minus_if_fail);
+
+        unowned SList<float?> list = positions;
+        foreach (ScrollerChild child in model)
+          {
+            child.position = (float)list.data;
+            list = list.next;
+          }
+
+        return value;
+    }
+
+    public int get_model_index_at_y_pos (float y, bool return_minus_if_fail=false)
     {
 
       // trying out a different method
@@ -174,6 +202,8 @@
 
               if (picked_actor is ScrollerChild == false)
                 {
+                  if (return_minus_if_fail)
+                    return -1;
                   // couldn't pick a single actor, return 0
                   return (y < padding.top + model[0].get_height () + spacing) ? 0 : model.size -1 ;
                 }
@@ -660,7 +690,7 @@
               if (child.get_animation () is Clutter.Animation)
                 {
                   //GLib.Value value = GLib.Value (GLib.Type.from_name ("string"));
-                  GLib.Value value = typeof (float);
+                  GLib.Value value = Value (typeof (float));
                   Clutter.Interval interval = child.get_animation ().get_interval ("position");
                   interval.get_final_value (value);
                   if (value.get_float () != transitions[index].position)
@@ -892,17 +922,17 @@
       for (int index = draw_btf.size-1; index >= 0; index--)
         {
           ScrollerChild child = draw_btf[index];
-          if (child is LauncherChild && child.opacity > 0)
+          if (child is ScrollerChild && child.opacity > 0)
             {
-              (child as LauncherChild).paint ();
+              (child as ScrollerChild).paint ();
             }
         }
 
       foreach (ScrollerChild child in draw_ftb)
         {
-          if (child is LauncherChild && child.opacity > 0)
+          if (child is ScrollerChild && child.opacity > 0)
             {
-              (child as LauncherChild).paint ();
+              (child as ScrollerChild).paint ();
             }
         }
 
@@ -919,17 +949,17 @@
       for (int index = draw_btf.size-1; index >= 0; index--)
         {
           ScrollerChild child = draw_btf[index];
-          if (child is LauncherChild && child.opacity > 0)
+          if (child is ScrollerChild && child.opacity > 0)
             {
-              (child as LauncherChild).paint ();
+              (child as ScrollerChild).paint ();
             }
         }
 
       foreach (ScrollerChild child in draw_ftb)
         {
-          if (child is LauncherChild && child.opacity > 0)
+          if (child is ScrollerChild && child.opacity > 0)
             {
-              (child as LauncherChild).paint ();
+              (child as ScrollerChild).paint ();
             }
         }
 
 
=== modified file 'unity-private/launcher/scrollerchild-controller.vala'
--- unity-private/launcher/scrollerchild-controller.vala	2010-07-15 09:29:49 +0000
+++ unity-private/launcher/scrollerchild-controller.vala	2010-07-22 16:19:42 +0000
@@ -37,7 +37,10 @@
   {
     public ScrollerChild child {get; construct;}
     public signal void request_removal (); //call when not needed anymore so we can unref
-    public string name = "If you can read this, file a bug!!";
+
+    public string name {get; set;}
+    public bool hide {get; set;}
+
 
     public signal void closed ();
 
@@ -46,6 +49,7 @@
     protected bool button_down = false;
     protected float click_start_pos = 0.0f;
     protected int drag_sensitivity = 7;
+    private Unity.ThemeFilePath theme_file_path;
 
     protected QuicklistController? menu {get; set;}
 
@@ -56,6 +60,8 @@
 
     construct
     {
+      theme_file_path = new Unity.ThemeFilePath ();
+      name = "Bug Found, You Defeated Unity";
       child.controller = this;
       child.button_press_event.connect (on_press_event);
       child.button_release_event.connect (on_release_event);
@@ -71,11 +77,26 @@
     }
 
     public delegate void menu_cb (Dbusmenu.Menuitem? menu);
-    public abstract void get_menu_actions (menu_cb callback);
-    public abstract void get_menu_navigation (menu_cb callback);
-
-    public abstract void activate ();
-    public abstract QuicklistController get_menu_controller ();
+
+    public virtual void get_menu_actions (menu_cb callback)
+    {
+      callback (null);
+    }
+
+    public virtual void get_menu_navigation (menu_cb callback)
+    {
+      callback (null);
+    }
+
+    public virtual void activate ()
+    {
+      // do nothing!
+    }
+
+    public virtual QuicklistController get_menu_controller ()
+    {
+      return null;
+    }
 
     private bool on_leave_event (Clutter.Event event)
     {
@@ -140,6 +161,7 @@
     private void ensure_menu_state ()
     {
       //no tooltips on drag
+
       if (Unity.Drag.Controller.get_default ().is_dragging) return;
 
       if (menu is QuicklistController == false)
@@ -177,7 +199,7 @@
     // this is for our drag handling
     public Clutter.Actor get_icon ()
     {
-      return child;
+      return child.get_content ();
     }
 
     public string get_drag_data ()
@@ -204,5 +226,85 @@
         }
         return false;
     }
+
+    /* all this icon loading stuff can go when we switch from liblauncher to
+     * bamf - please ignore any icon loading bugs :-)
+     */
+    protected void load_icon_from_icon_name (string icon_name)
+    {
+      // first try to load from a path;
+      if (try_load_from_file (icon_name))
+        {
+          return;
+        }
+
+      //try to load from a path that we augment
+      if (try_load_from_file ("/usr/share/pixmaps/" + icon_name))
+        {
+          return;
+        }
+
+      theme_file_path = new Unity.ThemeFilePath ();
+
+      // add our searchable themes
+      Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
+      theme_file_path.add_icon_theme (theme);
+      theme = new Gtk.IconTheme ();
+
+      theme.set_custom_theme ("unity-icon-theme");
+      theme_file_path.add_icon_theme (theme);
+      theme.set_custom_theme ("Web");
+      theme_file_path.add_icon_theme (theme);
+
+      theme_file_path.found_icon_path.connect ((theme, filepath) => {
+        try
+          {
+            child.icon = new Gdk.Pixbuf.from_file (filepath);
+          }
+        catch (Error e)
+          {
+            warning (@"Could not load from $filepath");
+          }
+      });
+      theme_file_path.failed.connect (() => {
+        // we didn't get an icon, so just load the failcon
+        try
+          {
+            var default_theme = Gtk.IconTheme.get_default ();
+            child.icon = default_theme.load_icon(Gtk.STOCK_MISSING_IMAGE, 48, 0);
+          }
+        catch (Error e)
+          {
+            warning (@"Could not load any icon for %s", icon_name);
+          }
+      });
+      theme_file_path.get_icon_filepath (icon_name);
+    }
+
+    private bool try_load_from_file (string filepath)
+    {
+      Gdk.Pixbuf pixbuf = null;
+      if (FileUtils.test(filepath, FileTest.IS_REGULAR))
+        {
+          try
+            {
+              pixbuf = new Gdk.Pixbuf.from_file_at_scale(filepath,
+                                                         48, 48, true);
+            }
+          catch (Error e)
+            {
+              warning ("Unable to load image from file '%s': %s",
+                       filepath,
+                       e.message);
+            }
+
+          if (pixbuf is Gdk.Pixbuf)
+            {
+              child.icon = pixbuf;
+              return true;
+            }
+        }
+      return false;
+    }
   }
 }
 
=== modified file 'unity-private/launcher/scrollerchild.vala'
--- unity-private/launcher/scrollerchild.vala	2010-06-24 11:22:50 +0000
+++ unity-private/launcher/scrollerchild.vala	2010-07-22 16:19:42 +0000
@@ -24,6 +24,23 @@
 
 namespace Unity.Launcher
 {
+  const string HONEYCOMB_MASK_FILE = Unity.PKGDATADIR
+    + "/honeycomb-mask.png";
+  const string MENU_BG_FILE = Unity.PKGDATADIR
+    + "/tight_check_4px.png";
+
+  const float WIGGLE_SIZE = 5; // how many degree's to wiggle on either side.
+  const int WIGGLE_FREQUENCY = 5; // x times a second
+  const int WIGGLE_RUN_LENGTH = 5000; // 5 seconds of wiggle
+  const int WIGGLE_PAUSE_LENGTH = 20; // followed by 20 seconds of no wiggle
+
+  private enum AnimState {
+    RISING,
+    LOOPING,
+    FALLING,
+    STOPPED
+  }
+
   public enum PinType {
     UNPINNED,
     PINNED,
@@ -31,12 +48,8 @@
     NEVER
   }
 
-  public abstract class ScrollerChild : Ctk.Actor
+  public class ScrollerChild : Ctk.Actor
   {
-    construct
-    {
-    }
-
     public Gdk.Pixbuf icon {get; set;}
     public PinType pin_type;
     public float position {get; set;}
@@ -47,8 +60,6 @@
     public float rotation {get; set;}
     public ScrollerChildController controller; // this sucks. shouldn't be here, can't help it.
 
-    public abstract void force_rotation_jump (float degrees);
-
     public string to_string ()
     {
       return "A scroller child; running: %s, active: %s, position: %f, opacity %f".printf (
@@ -57,5 +68,535 @@
                 position,
                 opacity);
     }
+
+    private UnityIcon processed_icon;
+    private ThemeImage active_indicator;
+    private ThemeImage running_indicator;
+    private Gdk.Pixbuf honeycomb_mask;
+
+    // effects
+    private Ctk.EffectDropShadow effect_drop_shadow;
+    private Ctk.EffectGlow effect_icon_glow;
+
+    // animations
+    private Clutter.Animation active_indicator_anim;
+    private Clutter.Animation running_indicator_anim;
+    private Clutter.Animation rotate_anim;
+    private Clutter.Timeline  wiggle_timeline;
+    private Clutter.Timeline  glow_timeline;
+    private Clutter.Timeline  rotate_timeline;
+    private AnimState glow_state;
+    private AnimState wiggle_state;
+    private AnimState rotate_state;
+
+    private float old_rotate_value = 0.0f;
+
+    construct
+    {
+      load_textures ();
+      position = 0.0f;
+
+      //icon glow
+      glow_timeline = new Clutter.Timeline (1);
+      wiggle_timeline = new Clutter.Timeline (1);
+      rotate_timeline = new Clutter.Timeline (1);
+
+      glow_timeline.new_frame.connect (on_glow_timeline_new_frame);
+      wiggle_timeline.new_frame.connect (on_wiggle_timeline_new_frame);
+      rotate_timeline.new_frame.connect (on_rotate_timeline_new_frame);
+
+      notify["rotation"].connect (on_rotation_changed);
+    }
+
+    ~ScrollerChild ()
+    {
+      running_indicator.unparent ();
+      active_indicator.unparent ();
+    }
+
+    /* private methods */
+    private void load_textures ()
+    {
+      active_indicator = new ThemeImage ("application-selected");
+      running_indicator = new ThemeImage ("application-running");
+
+      active_indicator.set_parent (this);
+      running_indicator.set_parent (this);
+      active_indicator.set_opacity (0);
+      running_indicator.set_opacity (0);
+
+      try
+        {
+          honeycomb_mask = new Gdk.Pixbuf.from_file(HONEYCOMB_MASK_FILE);
+        }
+      catch (Error e)
+        {
+          warning ("Unable to load asset %s: %s",
+                   HONEYCOMB_MASK_FILE,
+                   e.message);
+        }
+
+        processed_icon = new UnityIcon (null, null);
+        processed_icon.set_size (48, 48);
+        processed_icon.set_parent (this);
+
+        notify["icon"].connect (on_icon_changed);
+        notify["running"].connect (on_running_changed);
+        notify["active"].connect (on_active_changed);
+        notify["activating"].connect (on_activating_changed);
+        notify["needs-attention"].connect (on_needs_attention_changed);
+
+        // just trigger some notifications now to set inital state
+        on_running_changed ();
+        on_active_changed ();
+        on_rotation_changed ();
+    }
+
+    public Clutter.Actor get_content ()
+    {
+      return processed_icon;
+    }
+
+    /* alpha helpers */
+    private static float get_ease_out_sine (float alpha)
+    {
+      return (float)(Math.sin ((Math.PI_2 * alpha)));
+    }
+
+    private static float get_circular_alpha (float alpha)
+    {
+      //float sine = (float)(Math.sin (-Math.PI + (alpha * (Math.PI * 2))));
+      var sine = Math.sin ((alpha * (Math.PI * 2)) - Math.PI);
+      return Math.fmaxf(((float)sine / 2.0f) + 0.5f, 0.0f);;
+    }
+    /* animation callbacks */
+
+    private void on_rotate_timeline_new_frame ()
+    {
+      float progress = (float)rotate_timeline.get_progress ();
+      switch (rotate_state)
+        {
+          case AnimState.RISING:
+            rotate_anim_rising (progress);
+            break;
+
+          case AnimState.STOPPED:
+            rotate_timeline.stop ();
+            break;
+        }
+      processed_icon.do_queue_redraw ();
+    }
+
+    private void rotate_anim_rising (float progress)
+    {
+      progress = get_ease_out_sine (progress);
+      var diff = rotation - old_rotate_value;
+      float rotate_val = old_rotate_value + (progress * diff);
+
+      processed_icon.rotation = rotate_val;
+      if (progress >= 1.0)
+        {
+          rotate_state = AnimState.STOPPED;
+          rotate_timeline.stop ();
+        }
+    }
+
+    public void force_rotation_jump (float degrees)
+    {
+      processed_icon.rotation = degrees;
+      rotation = degrees;
+      rotate_state = AnimState.STOPPED;
+      rotate_timeline.stop ();
+      do_queue_redraw ();
+    }
+
+    private void on_glow_timeline_new_frame ()
+    {
+      float progress = (float)glow_timeline.get_progress ();
+      switch (glow_state)
+        {
+          case AnimState.RISING:
+            glow_anim_rising (progress);
+            break;
+
+          case AnimState.LOOPING:
+            glow_anim_looping (progress);
+            break;
+
+          case AnimState.FALLING:
+            glow_anim_falling (progress);
+            break;
+
+          default:
+            glow_state = AnimState.STOPPED;
+            glow_timeline.stop ();
+            break;
+        }
+
+      processed_icon.do_queue_redraw ();
+    }
+
+    private float previous_glow_alpha = 0.0f;
+    private void glow_anim_rising (float progress)
+    {
+      progress = get_ease_out_sine (progress);
+      effect_icon_glow.set_opacity (progress);
+      previous_glow_alpha = progress;
+      if (progress >= 1.0)
+        {
+          glow_state = AnimState.LOOPING;
+          glow_timeline.stop ();
+          glow_timeline.set_duration (LONG_DELAY);
+          glow_timeline.set_loop (true);
+          glow_timeline.start ();
+          return;
+        }
+    }
+
+    private void glow_anim_looping (float progress)
+    {
+      progress = 1.0f - get_circular_alpha (progress);
+      effect_icon_glow.set_opacity (progress);
+      previous_glow_alpha = progress;
+      processed_icon.do_queue_redraw ();
+    }
+
+    private void glow_anim_falling (float progress)
+    {
+      float alpha_length = previous_glow_alpha;
+      effect_icon_glow.set_opacity (alpha_length - (progress * alpha_length));
+
+      if (progress >= 1.0)
+        {
+          glow_state = AnimState.STOPPED;
+          glow_timeline.stop ();
+          glow_timeline.set_loop (false);
+        }
+    }
+
+    private void on_wiggle_timeline_new_frame ()
+    {
+      float progress = (float)wiggle_timeline.get_progress ();
+
+      switch (wiggle_state)
+        {
+          case AnimState.RISING:
+            wiggle_anim_rising (progress);
+            break;
+
+          case AnimState.LOOPING:
+            wiggle_anim_looping (progress);
+            break;
+
+          case AnimState.FALLING:
+            wiggle_anim_falling (progress);
+            break;
+
+          default:
+            wiggle_state = AnimState.STOPPED;
+            wiggle_timeline.stop ();
+            break;
+        }
+
+      processed_icon.do_queue_redraw ();
+    }
+
+    private float previous_wiggle_alpha = 0.0f;
+    private void wiggle_anim_rising (float progress)
+    {
+      progress = get_ease_out_sine (progress);
+      processed_icon.set_rotation (Clutter.RotateAxis.Z_AXIS, progress * WIGGLE_SIZE,
+                                   25.0f, 25.0f, 0.0f);
+      previous_wiggle_alpha = progress;
+      if (progress >= 1.0)
+        {
+          wiggle_state = AnimState.LOOPING;
+          wiggle_timeline.stop ();
+          wiggle_timeline.set_duration (WIGGLE_RUN_LENGTH);
+          wiggle_timeline.set_loop (true);
+          wiggle_timeline.start ();
+          return;
+        }
+    }
+
+    private void wiggle_anim_looping (float progress)
+    {
+      if (progress >= 1.0)
+        {
+          wiggle_state = AnimState.FALLING;
+          wiggle_timeline.stop ();
+          wiggle_timeline.set_loop (false);
+          wiggle_timeline.start ();
+        }
+
+      int frequency = WIGGLE_FREQUENCY * (WIGGLE_RUN_LENGTH / 1000);
+      progress = get_circular_alpha (Math.fmodf (progress * frequency, 1.0f));
+      progress = (1.0f - progress) * 2.0f - 1.0f;
+      processed_icon.set_rotation (Clutter.RotateAxis.Z_AXIS, progress * WIGGLE_SIZE,
+                                   25.0f, 25.0f, 0.0f);
+      processed_icon.do_queue_redraw ();
+      previous_wiggle_alpha = progress;
+
+
+    }
+
+    private bool check_continue_wiggle ()
+    {
+      if (needs_attention)
+        {
+          wiggle_timeline.set_duration (500 / WIGGLE_FREQUENCY);
+          wiggle_state = AnimState.RISING;
+          wiggle_timeline.start ();
+        }
+      return false;
+    }
+
+    private void wiggle_anim_falling (float progress)
+    {
+      float alpha_length = previous_wiggle_alpha;
+      float angle = alpha_length - (progress * alpha_length);
+      processed_icon.set_rotation (Clutter.RotateAxis.Z_AXIS, angle,
+                                   25.0f, 25.0f, 0.0f);
+
+      if (progress >= 1.0)
+        {
+          wiggle_state = AnimState.STOPPED;
+          wiggle_timeline.stop ();
+          wiggle_timeline.set_loop (false);
+          GLib.Timeout.add_seconds (WIGGLE_PAUSE_LENGTH, check_continue_wiggle);
+        }
+    }
+
+    /* notifications */
+    private void on_icon_changed ()
+    {
+      if (icon is Gdk.Pixbuf)
+        {
+          Gdk.Pixbuf scaled_buf;
+          int max_size = 48;
+          if (!Unity.pixbuf_is_tile (icon))
+            max_size = 40;
+
+          if (icon.get_width () > max_size || icon.get_height () > max_size)
+            {
+              scaled_buf = icon.scale_simple (max_size, max_size, Gdk.InterpType.HYPER);
+            }
+          else
+            {
+              scaled_buf = icon;
+            }
+
+          Gdk.Pixbuf color_buf = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, 1, 1);
+          uint red, green, blue;
+          Unity.get_average_color (scaled_buf, out red, out green, out blue);
+          unowned uchar[] pixels = color_buf.get_pixels ();
+          pixels[0] = (uchar)red;
+          pixels[1] = (uchar)green;
+          pixels[2] = (uchar)blue;
+          pixels[3] = 255;
+
+          var tex = GtkClutter.texture_new_from_pixbuf (scaled_buf);
+          var color = GtkClutter.texture_new_from_pixbuf (color_buf);
+
+          processed_icon = new UnityIcon (tex as Clutter.Texture, color as Clutter.Texture);
+          processed_icon.set_parent (this);
+          processed_icon.rotation = rotation;
+
+          this.effect_drop_shadow = new Ctk.EffectDropShadow (5.0f, 0, 2);
+          effect_drop_shadow.set_opacity (0.4f);
+          this.effect_drop_shadow.set_margin (5);
+          this.processed_icon.add_effect (effect_drop_shadow);
+
+          do_queue_redraw ();
+        }
+    }
+
+    private void on_running_changed ()
+    {
+      uint target_opacity = 0;
+      if (running)
+        target_opacity = 255;
+
+      if (running_indicator_anim is Clutter.Animation)
+        running_indicator_anim.completed ();
+
+      running_indicator_anim = running_indicator.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE,
+                                                          SHORT_DELAY,
+                                                          "opacity", target_opacity);
+    }
+
+    private void on_active_changed ()
+    {
+      uint target_opacity = 0;
+      if (active)
+        target_opacity = 255;
+
+      if (active_indicator_anim is Clutter.Animation)
+        active_indicator_anim.completed ();
+      active_indicator_anim = active_indicator.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE,
+                                                        SHORT_DELAY,
+                                                        "opacity", target_opacity);
+    }
+
+    private void on_rotation_changed ()
+    {
+      old_rotate_value = processed_icon.rotation;
+
+      if (rotate_timeline is Clutter.Timeline == false)
+        return;
+
+      if (rotate_timeline.is_playing ())
+        {
+          rotate_timeline.stop ();
+          processed_icon.rotation = old_rotate_value;
+        }
+
+      rotate_timeline.set_duration (300);
+      rotate_state = AnimState.RISING;
+      rotate_timeline.start ();
+    }
+
+    private void on_activating_changed ()
+    {
+      if (glow_timeline.is_playing () && activating == false)
+        {
+          glow_timeline.stop ();
+          glow_timeline.set_duration (SHORT_DELAY);
+          glow_state = AnimState.FALLING;
+          glow_timeline.start ();
+        }
+      else if (glow_timeline.is_playing () == false && activating)
+        {
+          effect_icon_glow = new Ctk.EffectGlow ();
+          Clutter.Color c = Clutter.Color () {
+            red = 255,
+            green = 255,
+            blue = 255,
+            alpha = 255
+          };
+          effect_icon_glow.set_background_texture (honeycomb_mask);
+          effect_icon_glow.set_color (c);
+          effect_icon_glow.set_opacity (1.0f);
+          processed_icon.add_effect (effect_icon_glow);
+          effect_icon_glow.set_margin (6);
+
+          glow_timeline.set_duration (SHORT_DELAY);
+          glow_state = AnimState.RISING;
+          glow_timeline.start ();
+        }
+    }
+
+    private void on_needs_attention_changed ()
+    {
+      if (needs_attention && wiggle_timeline.is_playing () == false)
+        {
+          //start wiggling
+          wiggle_timeline.set_duration (500 / WIGGLE_FREQUENCY);
+          wiggle_state = AnimState.RISING;
+          wiggle_timeline.start ();
+        }
+      else if (needs_attention == false && wiggle_timeline.is_playing ())
+        {
+          //stop wiggling
+          wiggle_timeline.stop ();
+          wiggle_timeline.set_duration (500 / WIGGLE_FREQUENCY);
+          wiggle_state = AnimState.FALLING;
+          wiggle_timeline.start ();
+        }
+    }
+
+    /* clutter overrides */
+    public override void get_preferred_width (float for_height,
+                                                out float minimum_width,
+                                                out float natural_width)
+    {
+      float nat, min;
+      processed_icon.get_preferred_width (for_height, out min, out nat);
+      natural_width = nat;
+      minimum_width = min;
+
+      running_indicator.get_preferred_width (for_height, out min, out nat);
+      natural_width += nat;
+
+      active_indicator.get_preferred_width (for_height, out min, out nat);
+      natural_width += nat;
+    }
+
+    public override void get_preferred_height (float for_width,
+                                               out float minimum_height,
+                                               out float natural_height)
+    {
+      natural_height = 48;
+      minimum_height = 48;
+    }
+
+    public override void allocate (Clutter.ActorBox box, Clutter.AllocationFlags flags)
+    {
+      float x, y;
+      x = 0;
+      y = 0;
+      base.allocate (box, flags);
+
+      Clutter.ActorBox child_box = Clutter.ActorBox ();
+
+      //allocate the running indicator first
+      float width, height, n_width, n_height;
+      running_indicator.get_preferred_width (58, out n_width, out width);
+      running_indicator.get_preferred_height (58, out n_height, out height);
+      child_box.x1 = 0;
+      child_box.y1 = (box.get_height () - height) / 2.0f;
+      child_box.x2 = child_box.x1 + width;
+      child_box.y2 = child_box.y1 + height;
+      running_indicator.allocate (child_box, flags);
+      x += child_box.get_width ();
+
+      //allocate the icon
+      processed_icon.get_preferred_width (48, out width, out n_width);
+      processed_icon.get_preferred_height (48, out height, out n_height);
+      child_box.x1 = (box.get_width () - width) / 2.0f;
+      child_box.y1 = y;
+      child_box.x2 = child_box.x1 + 48;
+      child_box.y2 = child_box.y1 + height;
+      processed_icon.allocate (child_box, flags);
+
+      //allocate the active indicator
+      active_indicator.get_preferred_width (48, out n_width, out width);
+      active_indicator.get_preferred_height (48, out n_height, out height);
+      child_box.x1 = box.get_width () - width;
+      child_box.y1 = (box.get_height () - height) / 2.0f;
+      child_box.x2 = child_box.x1 + width;
+      child_box.y2 = child_box.y1 + height;
+      active_indicator.allocate (child_box, flags);
+
+    }
+
+    public override void pick (Clutter.Color color)
+    {
+      base.pick (color);
+    }
+
+    public override void paint ()
+    {
+      active_indicator.paint ();
+      running_indicator.paint ();
+
+      processed_icon.paint ();
+    }
+
+    public override void map ()
+    {
+      base.map ();
+      running_indicator.map ();
+      active_indicator.map ();
+      processed_icon.map ();
+    }
+
+    public override void unmap ()
+    {
+      base.unmap ();
+      running_indicator.unmap ();
+      active_indicator.unmap ();
+      processed_icon.unmap ();
+    }
   }
 }
 
=== modified file 'unity/drag-controller.vala'
--- unity/drag-controller.vala	2010-06-08 09:43:43 +0000
+++ unity/drag-controller.vala	2010-07-22 16:19:42 +0000
@@ -63,10 +63,12 @@
 
     public void start_drag (Unity.Drag.Model model, float offset_x, float offset_y)
     {
+
       if (!(this.view is View)) {
         this.view = new View (model.get_icon ().get_stage () as Clutter.Stage);
       }
       this.view.hook_actor_to_cursor (model.get_icon (), offset_x, offset_y);
+
       model.get_icon ().parent_set.connect (rehouse_orphaned_child);
       this.model = model;
       this.drag_start (model);
@@ -88,7 +90,7 @@
           // no parent. so set stage
           Clutter.Stage stage = old_parent.get_stage () as Clutter.Stage;
           actor.set_parent (stage);
-          actor.set_position (-10000, -10000);
+          actor.set_position (20000, 20000);
         }
     }
 
 
=== modified file 'unity/drag-view.vala'
--- unity/drag-view.vala	2010-06-08 09:43:43 +0000
+++ unity/drag-view.vala	2010-07-22 16:19:42 +0000
@@ -50,7 +50,6 @@
       this.offset_y = offset_y;
 
       this.hooked_actor = new Clutter.Clone (actor);
-      this.hooked_actor.unparent ();
       this.stage.add_actor (this.hooked_actor);
 
       actor.get_transformed_position (out x, out y);
@@ -94,6 +93,8 @@
       this.hooked_actor.set_position (event.motion.x - this.offset_x,
                                       event.motion.y - this.offset_y);
       this.motion (event.motion.x, event.motion.y);
+      this.hooked_actor.set_opacity (255);
+      this.hooked_actor.show ();
       return false;
     }
 
 
=== modified file 'unity/icon-postprocessor.vala'
--- unity/icon-postprocessor.vala	2010-06-24 09:10:53 +0000
+++ unity/icon-postprocessor.vala	2010-07-22 16:19:42 +0000
@@ -254,6 +254,11 @@
     g_total = g_total / uint.max (total_caught_pixels, 1);
     b_total = b_total / uint.max (total_caught_pixels, 1);
 
+    rs_total = rs_total / (width * height);
+    gs_total = gs_total / (width * height);
+    bs_total = bs_total / (width * height);
+
+
     // get a new super saturated value based on our totals
     if (total_caught_pixels <= 20)
       {
@@ -491,7 +496,9 @@
         }
       };
 
-      uchar opacity = self.get_paint_opacity ();
+      uchar opacity = self.get_opacity ();
+
+      //debug (@"opacity is set to $opacity");
 
       self.bg_mat.set_color4ub (opacity, opacity, opacity, opacity);
       self.bgcol_material.set_color4ub (opacity, opacity, opacity, opacity);