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

[Gord Allott]

bunch of fixes from the sprint

=== 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 14:56:07 +0000
@@ -48,7 +48,7 @@
       unhovered_opacity = 255;
 
       this.source = source;
-      
+
       if (source is Mutter.Window)
         clone = new Clutter.Clone ((source as Mutter.Window).get_texture ());
       else
@@ -117,7 +117,6 @@
 
     private ExposeClone? last_selected_clone = null;
 
-    private bool menu_in_hover_close_state = false;
 
     public ExposeManager (Plugin plugin, Launcher.Launcher launcher)
     {
@@ -137,12 +136,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)
@@ -175,26 +168,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 ();
@@ -223,13 +196,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)
@@ -524,23 +490,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 +504,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 14:56:07 +0000
@@ -308,7 +308,6 @@
 
     private void on_focus_window_fullscreen_changed ()
     {
-      warning ("FOCUS WINDOW FULLSCREEN CHANGED");
       check_fullscreen_obstruction ();
     }
 
@@ -466,32 +465,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 +512,7 @@
 
     public void stop_expose ()
     {
-      dexpose_windows ();
+      expose_manager.end_expose ();
     }
 
     public void show_window (uint32 xid)
@@ -585,10 +558,6 @@
       expose_manager.start_expose (windows);
     }
 
-    public void dexpose_windows ()
-    {
-      expose_manager.end_expose ();
-    }
 
     public void hide_unity ()
     {

=== 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 14:56:07 +0000
@@ -63,20 +63,12 @@
       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 +77,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 +110,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 +171,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,14 +264,38 @@
       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 ();
+<<<<<<< TREE
           if (is_sticky ())
             pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Remove from 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");
+            }
+>>>>>>> MERGE-SOURCE
           else
+<<<<<<< TREE
             pinning_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Add to launcher"));
 
+=======
+            {
+              if (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_UNCHECKED);
+                }
+            }
+>>>>>>> MERGE-SOURCE
           pinning_item.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
           pinning_item.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
           pinning_item.item_activated.connect ((timestamp) => {
@@ -299,7 +308,11 @@
       if (app is Bamf.Application)
         {
           Dbusmenu.Menuitem app_item = new Dbusmenu.Menuitem ();
+<<<<<<< TREE
           app_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Quit"));
+=======
+          app_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Quit");
+>>>>>>> MERGE-SOURCE
           app_item.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
           app_item.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
 
@@ -317,6 +330,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 +352,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 +395,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,6 +404,9 @@
       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");

=== modified 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	2010-07-22 14:56:07 +0000
@@ -77,6 +77,16 @@
       rotate_timeline.new_frame.connect (on_rotate_timeline_new_frame);
 
       notify["rotation"].connect (on_rotation_changed);
+      notify["opacity"].connect (on_opacity_changed);
+    }
+
+    private void on_opacity_changed ()
+    {
+      //debug (@"opacity changes on launcher child, set to $(opacity)");
+      if (processed_icon is Clutter.Actor)
+        {
+          processed_icon.set_opacity (opacity);
+        }
     }
 
     ~LauncherChild ()

=== 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 14:56:07 +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 14:56:07 +0000
@@ -75,38 +75,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
+            {
+              LauncherChild child = new LauncherChild ();
+              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 +111,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);
@@ -267,8 +263,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 +291,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-view.vala'
--- unity-private/launcher/scroller-view.vala	2010-07-19 13:06:02 +0000
+++ unity-private/launcher/scroller-view.vala	2010-07-22 14:56:07 +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)

=== 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 14:56:07 +0000
@@ -38,6 +38,8 @@
     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 bool hide {get; set;}
+
 
     public signal void closed ();
 
@@ -140,6 +142,7 @@
     private void ensure_menu_state ()
     {
       //no tooltips on drag
+
       if (Unity.Drag.Controller.get_default ().is_dragging) return;
 
       if (menu is QuicklistController == 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 14:56:07 +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);