Merge lp:~canonical-dx-team/unity/unity.autohide-like-a-boss into lp:unity

[Jason Smith]

Implements a series of autohide behaviors similar to what is currently in design mockups. The behaviors are not well polished yet.

[lp:~canonical-dx-team/unity/unity.autohide-like-a-boss]

628. By Jason Smith on 2010-11-25

shorten present time on minimize animation

629. By Jason Smith on 2010-11-25

ensure we minimize to the icon

630. By Jason Smith on 2010-11-25

Give a little more control over behavior

631. By Jason Smith on 2010-11-25

fix paint under certain conditions (transformed + notify osd)

632. By Jason Smith on 2010-11-25

minor render glitch

[Sam Spilsbury (smspillaz)]

Works great.

review: Approve

=== added file 'resources/round_glow_62x62.png'
Binary files resources/round_glow_62x62.png	1970-01-01 00:00:00 +0000 and resources/round_glow_62x62.png	2010-11-25 07:36:29 +0000 differ
=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2010-11-24 18:59:55 +0000
+++ src/BamfLauncherIcon.cpp	2010-11-25 07:36:29 +0000
@@ -67,6 +67,30 @@
     g_object_unref (m_App);
 }
 
+bool
+BamfLauncherIcon::IconOwnsWindow (Window w)
+{
+  GList *children, *l;
+  BamfView *view;
+
+  children = bamf_view_get_children (BAMF_VIEW (m_App));
+
+  for (l = children; l; l = l->next)
+  {
+    view = (BamfView *) l->data;
+
+    if (BAMF_IS_WINDOW (view))
+    {
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
+        
+      if (xid == w)
+        return true;
+    }
+  }
+  
+  return false;
+}
+
 void
 BamfLauncherIcon::OnMouseClick (int button)
 {
@@ -159,7 +183,10 @@
     self->SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, running);
     
     if (running)
+    {
       self->EnsureWindowState ();
+      self->UpdateIconGeometries (self->GetCenter ());
+    }
 }
 
 void
@@ -197,6 +224,7 @@
 {
     BamfLauncherIcon *self = (BamfLauncherIcon*) data;
     self->EnsureWindowState ();
+    self->UpdateIconGeometries (self->GetCenter ());
 }
 
 void
@@ -227,8 +255,9 @@
     return result;
 }
 
-void 
-BamfLauncherIcon::OnCenterStabilized (nux::Point3 center)
+
+void
+BamfLauncherIcon::UpdateIconGeometries (nux::Point3 center)
 {
     GList *children, *l;
     BamfView *view;
@@ -255,3 +284,9 @@
         }
     }
 }
+
+void 
+BamfLauncherIcon::OnCenterStabilized (nux::Point3 center)
+{
+  UpdateIconGeometries (center);
+}

=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2010-11-24 18:59:55 +0000
+++ src/BamfLauncherIcon.h	2010-11-25 07:36:29 +0000
@@ -43,7 +43,10 @@
     void OnMouseClick (int button);
     std::list<DbusmenuClient *> GetMenus ();
     
+    void UpdateIconGeometries (nux::Point3 center);
     void OnCenterStabilized (nux::Point3 center);
+    
+    bool IconOwnsWindow (Window w);
 
 private:
     BamfApplication *m_App;

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-11-24 23:07:01 +0000
+++ src/Launcher.cpp	2010-11-25 07:36:29 +0000
@@ -230,12 +230,14 @@
     _icon_under_mouse       = NULL;
     _icon_mouse_down        = NULL;
     _icon_image_size        = 48;
+    _icon_glow_size         = 62;
     _icon_image_size_delta  = 6;
     _icon_size              = _icon_image_size + _icon_image_size_delta;
     
     _icon_bkg_texture       = nux::CreateTextureFromFile (PKGDATADIR"/round_corner_54x54.png");
     _icon_outline_texture   = nux::CreateTextureFromFile (PKGDATADIR"/round_outline_54x54.png");
     _icon_shine_texture     = nux::CreateTextureFromFile (PKGDATADIR"/round_shine_54x54.png");
+    _icon_glow_texture      = nux::CreateTextureFromFile (PKGDATADIR"/round_glow_62x62.png");
     _icon_2indicator        = nux::CreateTextureFromFile (PKGDATADIR"/2indicate_54x54.png");
     _icon_3indicator        = nux::CreateTextureFromFile (PKGDATADIR"/3indicate_54x54.png");
     _icon_4indicator        = nux::CreateTextureFromFile (PKGDATADIR"/4indicate_54x54.png");
@@ -297,9 +299,9 @@
     clock_gettime (CLOCK_MONOTONIC, &current);
     
     if (_hidden)
-        return CLAMP ((float) (TimeDelta (&current, &_autohide_time)) / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
+        return CLAMP ((float) (TimeDelta (&current, &_autohide_time)) / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
     else
-        return 1.0f - CLAMP ((float) (TimeDelta (&current, &_autohide_time)) / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
+        return 1.0f - CLAMP ((float) (TimeDelta (&current, &_autohide_time)) / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
 }
 
 gboolean Launcher::AnimationTimeout (gpointer data)
@@ -341,12 +343,9 @@
     if (TimeDelta (&current, &starting_time) < (ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2))
         return true;
     
-    if (icon->GetQuirk (LAUNCHER_ICON_QUIRK_URGENT))
-    {
-        struct timespec urgent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
-        if (TimeDelta (&current, &urgent_time) < (ANIM_DURATION_LONG * URGENT_BLINKS * 2))
-            return true;
-    }
+    struct timespec urgent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
+    if (TimeDelta (&current, &urgent_time) < (ANIM_DURATION_LONG * URGENT_BLINKS * 2))
+        return true;
     
     struct timespec present_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
     if (TimeDelta (&current, &present_time) < ANIM_DURATION)
@@ -376,7 +375,7 @@
     if (TimeDelta (&current, &_drag_end_time) < ANIM_DURATION_LONG)
         return true;
     
-    if (TimeDelta (&current, &_autohide_time) < ANIM_DURATION_LONG)
+    if (TimeDelta (&current, &_autohide_time) < ANIM_DURATION_SHORT)
         return true;
     
     // animations happening on specific icons
@@ -460,18 +459,26 @@
 
 float Launcher::IconPresentProgress (LauncherIcon *icon, struct timespec current)
 {
+    struct timespec icon_present_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
+    int ms = TimeDelta (&current, &icon_present_time);
+    float result = CLAMP ((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
+    
     if (icon->GetQuirk (LAUNCHER_ICON_QUIRK_PRESENTED))
-    {
-        struct timespec icon_present_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
-        int ms = TimeDelta (&current, &icon_present_time);
-        return CLAMP ((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
-    }
-    else
-    {
-        struct timespec icon_unpresent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
-        int ms = TimeDelta (&current, &icon_unpresent_time);
-        return 1.0f - CLAMP ((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
-    }
+        return result;
+    else
+        return 1.0f - result;
+}
+
+float Launcher::IconUrgentProgress (LauncherIcon *icon, struct timespec current)
+{
+    struct timespec urgent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
+    int urgent_ms = TimeDelta (&current, &urgent_time);
+    float result = CLAMP ((float) urgent_ms / (float) (ANIM_DURATION_LONG * URGENT_BLINKS * 2), 0.0f, 1.0f);
+    
+    if (icon->GetQuirk (LAUNCHER_ICON_QUIRK_URGENT))
+      return result;
+    else
+      return 1.0f - result;
 }
 
 float Launcher::IconUrgentPulseValue (LauncherIcon *icon, struct timespec current)
@@ -479,10 +486,7 @@
     if (!icon->GetQuirk (LAUNCHER_ICON_QUIRK_URGENT))
         return 1.0f; // we are full on in a normal condition
         
-    struct timespec urgent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
-    int urgent_ms = TimeDelta (&current, &urgent_time);
-    double urgent_progress = (double) CLAMP ((float) urgent_ms / (float) (ANIM_DURATION_LONG * URGENT_BLINKS * 2), 0.0f, 1.0f);
-    
+    double urgent_progress = (double) IconUrgentProgress (icon, current);
     return 0.5f + (float) (std::cos (M_PI * (float) (URGENT_BLINKS * 2) * urgent_progress)) * 0.5f;
 }
 
@@ -617,9 +621,10 @@
     }
     
     float autohide_progress = AutohideProgress ();
+    float autohide_offset = 0.0f;
     if (_autohide && autohide_progress > 0.0f)
     {
-        center.y -= geo.height * autohide_progress;
+        autohide_offset -= geo.width * autohide_progress;
     }
     
     // Inform the painter where to paint the box
@@ -629,7 +634,7 @@
         box_geo.height = sum + shelf_sum + _space_between_icons;
     
     if (_autohide)
-        box_geo.height -= box_geo.height * autohide_progress;
+        box_geo.x += autohide_offset;
     
     shelf_geo = nux::Geometry (box_geo.x, box_geo.height - shelf_sum, box_geo.width, shelf_sum);
     
@@ -645,7 +650,6 @@
         
         arg.icon           = icon;
         arg.alpha          = 1.0f;
-        arg.glow_intensity = 0.0f;
         arg.running_arrow  = false;
         arg.active_arrow   = icon->GetQuirk (LAUNCHER_ICON_QUIRK_ACTIVE);
         arg.folding_rads   = 0.0f;
@@ -659,6 +663,10 @@
         
         arg.backlight_intensity = IconBackgroundIntensity (icon, current);
         
+        float urgent_progress = IconUrgentProgress (icon, current);
+        urgent_progress = CLAMP (urgent_progress * 3, 0.0f, 1.0f); // we want to go 3x faster than the urgent normal cycle
+        arg.glow_intensity = urgent_progress;
+        
         // reset z
         center.z = 0;
         
@@ -682,13 +690,20 @@
         folding_progress *= 1.0f - present_progress;
         
         float half_size = (folded_size / 2.0f) + (_icon_size / 2.0f - folded_size / 2.0f) * (1.0f - folding_progress);
-      
+        
+        float icon_hide_offset = autohide_offset;
+        
+        if (icon->PresentUrgency () == 1)
+          icon_hide_offset *= 0.5f + 0.5f * (1.0f - present_progress);
+        else if (icon->PresentUrgency () >= 2)
+          icon_hide_offset *= 1.0f - present_progress;
+        
         // icon is crossing threshold, start folding
         center.z += folded_z_distance * folding_progress;
         arg.folding_rads = animation_neg_rads * folding_progress;
         
         center.y += half_size * size_modifier;   // move to center
-        arg.center = nux::Point3 (center);       // copy center
+        arg.center = nux::Point3 (center.x + icon_hide_offset, center.y, center.z);       // copy center
         icon->SetCenter (nux::Point3 (center.x, center.y + vertical_offset, center.z));
         center.y += half_size * size_modifier;   // move to end
         
@@ -742,7 +757,7 @@
         float half_size = _icon_size / 2.0f;
       
         center.y += half_size * size_modifier;   // move to center
-        arg.center = nux::Point3 (center);       // copy center
+        arg.center = nux::Point3 (center.x + autohide_offset, center.y, center.z);       // copy center
         icon->SetCenter (nux::Point3 (center.x, center.y + vertical_offset, center.z));
         center.y += half_size * size_modifier;   // move to end
         center.y += _space_between_icons * size_modifier;
@@ -793,7 +808,7 @@
     {
         if (_autohide_handle > 0)
             g_source_remove (_autohide_handle);
-        _autohide_handle = g_timeout_add (2000, &Launcher::OnAutohideTimeout, this);
+        _autohide_handle = g_timeout_add (1000, &Launcher::OnAutohideTimeout, this);
     }
 }
 
@@ -895,6 +910,7 @@
     icon->_xform_coords["HitArea"] = new nux::Vector4[4];
     icon->_xform_coords["Image"]   = new nux::Vector4[4];
     icon->_xform_coords["Tile"]    = new nux::Vector4[4];
+    icon->_xform_coords["Glow"]    = new nux::Vector4[4];
     
     // needs to be disconnected
     icon->needs_redraw.connect (sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw));
@@ -944,10 +960,9 @@
                           nux::Color bkg_color, 
                           float alpha, 
                           nux::Vector4 xform_coords[], 
+                          nux::Geometry geo,
                           bool render_indicators)
 {
-  nux::Geometry geo = GetGeometry();
-
   nux::Matrix4 ObjectMatrix;
   nux::Matrix4 ViewMatrix;
   nux::Matrix4 ProjectionMatrix;
@@ -1104,7 +1119,7 @@
       m_RunningIndicator = nux::CreateTextureFromPixbuf (pbuf);
       g_object_unref (pbuf);
     }
-    gPainter.Draw2DTexture (GfxContext, m_RunningIndicator, 0, markerCenter - (m_ActiveIndicator->GetHeight () / 2));
+    gPainter.Draw2DTexture (GfxContext, m_RunningIndicator, geo.x, markerCenter - (m_ActiveIndicator->GetHeight () / 2));
   }
   
   if (arg.active_arrow && render_indicators)
@@ -1115,11 +1130,11 @@
       m_ActiveIndicator = nux::CreateTextureFromPixbuf (pbuf);
       g_object_unref (pbuf);
     }
-    gPainter.Draw2DTexture (GfxContext, m_ActiveIndicator, geo.width - m_ActiveIndicator->GetWidth (), markerCenter - (m_ActiveIndicator->GetHeight () / 2));
+    gPainter.Draw2DTexture (GfxContext, m_ActiveIndicator, (geo.x + geo.width) - m_ActiveIndicator->GetWidth (), markerCenter - (m_ActiveIndicator->GetHeight () / 2));
   }
 }
 
-void Launcher::DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg arg)
+void Launcher::DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg arg, nux::Geometry geo)
 {
   GfxContext.GetRenderStates ().SetSeparateBlend (true,
                                                 GL_SRC_ALPHA,
@@ -1137,6 +1152,7 @@
                nux::Color(0xFF6D6D6D), 
                1.0f - arg.backlight_intensity, 
                arg.icon->_xform_coords["Tile"], 
+               geo,
                false);
   }
   
@@ -1148,6 +1164,7 @@
                arg.icon->BackgroundColor (), 
                arg.backlight_intensity, 
                arg.icon->_xform_coords["Tile"], 
+               geo,
                false);
   }
   
@@ -1164,6 +1181,7 @@
               nux::Color::White,
               arg.alpha,
               arg.icon->_xform_coords["Image"],
+              geo,
               true);
   
   if (arg.backlight_intensity > 0.0f)
@@ -1174,6 +1192,7 @@
                nux::Color::White, 
                arg.backlight_intensity, 
                arg.icon->_xform_coords["Tile"], 
+               geo,
                false);
   }
   
@@ -1186,6 +1205,7 @@
                  nux::Color::White, 
                  1.0f, 
                  arg.icon->_xform_coords["Tile"], 
+                 geo,
                  false);
       break;
     case 3:
@@ -1195,6 +1215,7 @@
                   nux::Color::White, 
                   1.0f, 
                   arg.icon->_xform_coords["Tile"], 
+                  geo,
                   false);
       break;
     case 4:
@@ -1204,9 +1225,22 @@
                  nux::Color::White, 
                  1.0f, 
                  arg.icon->_xform_coords["Tile"], 
+                 geo,
                  false);
       break;
   }
+  
+  if (arg.glow_intensity > 0.0f)
+  {
+    RenderIcon(GfxContext, 
+               arg, 
+               _icon_glow_texture,
+               arg.icon->GlowColor (), 
+               arg.glow_intensity, 
+               arg.icon->_xform_coords["Glow"], 
+               geo,
+               false);
+  }
 }
 
 void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -1229,7 +1263,8 @@
     // clear region    
     gPainter.PushDrawColorLayer(GfxContext, base, nux::Color(0x00000000), true, ROP);
     
-    GfxContext.PushClippingRectangle(bkg_box);
+    // clip vertically but not horizontally
+    GfxContext.PushClippingRectangle(nux::Geometry (base.x, bkg_box.y, base.width, bkg_box.height));
     GfxContext.GetRenderStates ().SetSeparateBlend (true,
                                                     GL_SRC_ALPHA,
                                                     GL_ONE_MINUS_SRC_ALPHA,
@@ -1249,7 +1284,7 @@
       if ((*rev_it).folding_rads >= 0.0f || (*rev_it).skip)
         continue;
       
-      DrawRenderArg (GfxContext, *rev_it);
+      DrawRenderArg (GfxContext, *rev_it, bkg_box);
     }
 
     std::list<Launcher::RenderArg>::iterator it;
@@ -1258,7 +1293,7 @@
       if ((*it).folding_rads < 0.0f || (*it).skip)
         continue;
       
-      DrawRenderArg (GfxContext, *it);
+      DrawRenderArg (GfxContext, *it, bkg_box);
     }
     
     /* draw shelf */
@@ -1275,17 +1310,17 @@
       if ((*it).skip)
         continue;
       
-      DrawRenderArg (GfxContext, *it);
+      DrawRenderArg (GfxContext, *it, bkg_box);
     }
     
+    gPainter.Paint2DQuadColor (GfxContext, nux::Geometry (bkg_box.x + bkg_box.width - 1, bkg_box.y, 1, bkg_box.height), nux::Color(0x60FFFFFF));
+
     GfxContext.GetRenderStates().SetColorMask (true, true, true, true);
     GfxContext.GetRenderStates ().SetSeparateBlend (false,
                                                     GL_SRC_ALPHA,
                                                     GL_ONE_MINUS_SRC_ALPHA,
                                                     GL_SRC_ALPHA,
                                                     GL_ONE_MINUS_SRC_ALPHA);
-          
-    gPainter.Paint2DQuadColor (GfxContext, nux::Geometry (bkg_box.x + bkg_box.width - 1, bkg_box.y, 1, bkg_box.height), nux::Color(0x60FFFFFF));
 
     gPainter.PopBackground();
     GfxContext.PopClippingRectangle();
@@ -1328,6 +1363,7 @@
 bool Launcher::MenuNotify(LauncherIcon* Icon)
 {
 
+
     return true;
 }
 
@@ -1419,15 +1455,15 @@
 
 void Launcher::RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags)
 {
-}
-
-const gchar* Launcher::GetName ()
-{
-	return "Launcher";
-}
-
-void Launcher::AddProperties (GVariantBuilder *builder)
-{
+}
+
+const gchar* Launcher::GetName ()
+{
+	return "Launcher";
+}
+
+void Launcher::AddProperties (GVariantBuilder *builder)
+{
 }
 
 void Launcher::EventLogic ()
@@ -1636,10 +1672,8 @@
 
     ViewProjectionMatrix = ProjectionMatrix*ViewMatrix*ObjectMatrix;
 
-    // Icon 
     SetIconXForm (launcher_icon, ViewProjectionMatrix, geo, x, y, w, h, z, "Tile");
     
-    //// icon image
     w = _icon_image_size;
     h = _icon_image_size;
     x = (*it).center.x - _icon_size/2.0f + _icon_image_size_delta/2.0f;
@@ -1648,6 +1682,14 @@
     
     SetIconXForm (launcher_icon, ViewProjectionMatrix, geo, x, y, w, h, z, "Image");
     
+    w = _icon_glow_size;
+    h = _icon_glow_size;
+    x = (*it).center.x - _icon_glow_size/2.0f;
+    y = (*it).center.y - _icon_glow_size/2.0f;
+    z = (*it).center.z;
+    
+    SetIconXForm (launcher_icon, ViewProjectionMatrix, geo, x, y, w, h, z, "Glow");
+    
     w = geo.width + 2;
     h = _icon_size + _space_between_icons;
     x = (*it).center.x - w/2.0f;

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2010-11-24 17:53:21 +0000
+++ src/Launcher.h	2010-11-25 07:36:29 +0000
@@ -125,6 +125,7 @@
   float GetHoverProgress ();
   float AutohideProgress ();
   float IconPresentProgress     (LauncherIcon *icon, struct timespec current);
+  float IconUrgentProgress      (LauncherIcon *icon, struct timespec current);
   float IconUrgentPulseValue    (LauncherIcon *icon, struct timespec current);
   float IconStartingPulseValue  (LauncherIcon *icon, struct timespec current);
   float IconBackgroundIntensity (LauncherIcon *icon, struct timespec current);
@@ -138,7 +139,7 @@
                    std::list<Launcher::RenderArg> &shelf_args, 
                    nux::Geometry &box_geo, nux::Geometry &shelf_geo);
 
-  void DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg arg);
+  void DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg arg, nux::Geometry geo);
 
   void OnIconAdded    (void *icon_pointer);
   void OnIconRemoved  (void *icon_pointer);
@@ -152,6 +153,7 @@
                    nux::Color bkg_color, 
                    float alpha, 
                    nux::Vector4 xform_coords[], 
+                   nux::Geometry geo,
                    bool render_indicators);
                 
   void SetIconXForm (LauncherIcon *icon, nux::Matrix4 ViewProjectionMatrix, nux::Geometry geo, 
@@ -198,6 +200,7 @@
   int _icon_size;
   int _icon_image_size;
   int _icon_image_size_delta;
+  int _icon_glow_size;
   int _dnd_delta;
   int _dnd_security;
   int _enter_y;
@@ -205,6 +208,7 @@
   nux::BaseTexture* _icon_bkg_texture;
   nux::BaseTexture* _icon_shine_texture;
   nux::BaseTexture* _icon_outline_texture;
+  nux::BaseTexture* _icon_glow_texture;
   nux::BaseTexture* _icon_2indicator;
   nux::BaseTexture* _icon_3indicator;
   nux::BaseTexture* _icon_4indicator;

=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp	2010-11-24 18:59:55 +0000
+++ src/LauncherController.cpp	2010-11-25 07:36:29 +0000
@@ -29,18 +29,18 @@
 
 LauncherController::LauncherController(Launcher* launcher, CompScreen *screen, nux::BaseWindow* window)
 {
-    _launcher = launcher;
-    _window = window;
-    _screen = screen;
-    _model = new LauncherModel ();
-    _sort_priority = 0;
-    
-    _launcher->SetModel (_model);
-    _favorite_store = FavoriteStore::GetDefault ();
+  _launcher = launcher;
+  _window = window;
+  _screen = screen;
+  _model = new LauncherModel ();
+  _sort_priority = 0;
   
-    g_timeout_add (5000, (GSourceFunc) &LauncherController::BamfTimerCallback, this);
-    InsertExpoAction ();
-    InsertTrash ();
+  _launcher->SetModel (_model);
+  _favorite_store = FavoriteStore::GetDefault ();
+
+  g_timeout_add (5000, (GSourceFunc) &LauncherController::BamfTimerCallback, this);
+  InsertExpoAction ();
+  InsertTrash ();
 }
 
 LauncherController::~LauncherController()
@@ -48,10 +48,34 @@
   _favorite_store->UnReference ();
 }
 
+void 
+LauncherController::PresentIconOwningWindow (Window window)
+{
+  LauncherModel::iterator it;
+  
+  for (it = _model->begin (); it != _model->end (); it++)
+  {
+    if ((*it)->IconOwnsWindow (window))
+    {
+      (*it)->Present (2, 600);
+      return;
+    }
+  }
+  
+  for (it = _model->shelf_begin (); it != _model->shelf_end (); it++)
+  {
+    if ((*it)->IconOwnsWindow (window))
+    {
+      (*it)->Present (2, 600);
+      return;
+    }
+  }
+}
+
 void
 LauncherController::OnExpoClicked (int button)
 {
-    PluginAdapter::Default ()->InitiateExpo ();
+  PluginAdapter::Default ()->InitiateExpo ();
 }
 
 void
@@ -65,131 +89,131 @@
 void
 LauncherController::InsertExpoAction ()
 {
-    SimpleLauncherIcon *expoIcon;
-    expoIcon = new SimpleLauncherIcon (_launcher);
-    
-    expoIcon->SetTooltipText ("Workspace Switcher");
-    expoIcon->SetIconName ("workspace-switcher");
-    expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE, true);
-    expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, false);
-    expoIcon->SetIconType (LAUNCHER_ICON_TYPE_END);
-    
-    expoIcon->MouseClick.connect (sigc::mem_fun (this, &LauncherController::OnExpoClicked));
-    
-    RegisterIcon (expoIcon);
+  SimpleLauncherIcon *expoIcon;
+  expoIcon = new SimpleLauncherIcon (_launcher);
+  
+  expoIcon->SetTooltipText ("Workspace Switcher");
+  expoIcon->SetIconName ("workspace-switcher");
+  expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE, true);
+  expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, false);
+  expoIcon->SetIconType (LAUNCHER_ICON_TYPE_END);
+  
+  expoIcon->MouseClick.connect (sigc::mem_fun (this, &LauncherController::OnExpoClicked));
+  
+  RegisterIcon (expoIcon);
 }
 
 bool
 LauncherController::CompareIcons (LauncherIcon *first, LauncherIcon *second)
 {
-    if (first->Type () < second->Type ())
-        return true;
-    else if (first->Type () > second->Type ())
-        return false;
+  if (first->Type () < second->Type ())
+    return true;
+  else if (first->Type () > second->Type ())
+    return false;
     
-    return first->SortPriority () < second->SortPriority ();
+  return first->SortPriority () < second->SortPriority ();
 }
 
 void
 LauncherController::RegisterIcon (LauncherIcon *icon)
 {
-    _model->AddIcon (icon);
-    _model->Sort (&LauncherController::CompareIcons);
+  _model->AddIcon (icon);
+  _model->Sort (&LauncherController::CompareIcons);
 }
 
 /* static private */
 bool 
 LauncherController::BamfTimerCallback (void *data)
 {
-    LauncherController *self = (LauncherController*) data;
+  LauncherController *self = (LauncherController*) data;
+
+  self->SetupBamf ();
   
-    self->SetupBamf ();
-    
-    return false;
+  return false;
 }
 
 /* static private */
 void
 LauncherController::OnViewOpened (BamfMatcher *matcher, BamfView *view, gpointer data)
 {
-    LauncherController *self = (LauncherController *) data;
-    BamfApplication *app;
-    
-    if (!BAMF_IS_APPLICATION (view))
-      return;
-    
-    app = BAMF_APPLICATION (view);
-    
-    BamfLauncherIcon *icon = new BamfLauncherIcon (self->_launcher, app, self->_screen);
-    icon->SetIconType (LAUNCHER_ICON_TYPE_APPLICATION);
-    icon->SetSortPriority (self->_sort_priority++);
+  LauncherController *self = (LauncherController *) data;
+  BamfApplication *app;
+  
+  if (!BAMF_IS_APPLICATION (view))
+    return;
+  
+  app = BAMF_APPLICATION (view);
+  
+  BamfLauncherIcon *icon = new BamfLauncherIcon (self->_launcher, app, self->_screen);
+  icon->SetIconType (LAUNCHER_ICON_TYPE_APPLICATION);
+  icon->SetSortPriority (self->_sort_priority++);
 
-    self->RegisterIcon (icon);
+  self->RegisterIcon (icon);
 }
 
 LauncherIcon *
 LauncherController::CreateFavorite (const char *file_path)
 {
-    BamfApplication *app;
-    BamfLauncherIcon *icon;
-
-    app = bamf_matcher_get_application_for_desktop_file (_matcher, file_path, true);
+  BamfApplication *app;
+  BamfLauncherIcon *icon;
+
+  app = bamf_matcher_get_application_for_desktop_file (_matcher, file_path, true);
+  
+  if (g_object_get_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen")))
+  {
+    bamf_view_set_sticky (BAMF_VIEW (app), true);
+    return 0;
+  }
+  
+  g_object_set_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen"), GINT_TO_POINTER (1));
+  
+  bamf_view_set_sticky (BAMF_VIEW (app), true);
+  icon = new BamfLauncherIcon (_launcher, app, _screen);
+  icon->SetIconType (LAUNCHER_ICON_TYPE_FAVORITE);
+  
+  return icon;
+}
+
+/* private */
+void
+LauncherController::SetupBamf ()
+{
+  GList *apps, *l;
+  GSList *favs, *f;
+  BamfApplication *app;
+  BamfLauncherIcon *icon;
+  int priority = 0;
+  
+  _matcher = bamf_matcher_get_default ();
+  
+  favs = FavoriteStore::GetDefault ()->GetFavorites ();
+  
+  for (f = favs; f; f = f->next)
+  {
+    LauncherIcon *fav = CreateFavorite ((const char *) f->data);
+    
+    if (fav)
+    {
+      fav->SetSortPriority (priority);
+      RegisterIcon (fav);
+      priority++;
+    }
+  }
+  
+  apps = bamf_matcher_get_applications (_matcher);
+  g_signal_connect (_matcher, "view-opened", (GCallback) &LauncherController::OnViewOpened, this);
+  
+  for (l = apps; l; l = l->next)
+  {
+    app = BAMF_APPLICATION (l->data);
     
     if (g_object_get_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen")))
-    {
-        bamf_view_set_sticky (BAMF_VIEW (app), true);
-        return 0;
-    }
-    
+      continue;
     g_object_set_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen"), GINT_TO_POINTER (1));
     
-    bamf_view_set_sticky (BAMF_VIEW (app), true);
     icon = new BamfLauncherIcon (_launcher, app, _screen);
-    icon->SetIconType (LAUNCHER_ICON_TYPE_FAVORITE);
-    
-    return icon;
-}
-
-/* private */
-void
-LauncherController::SetupBamf ()
-{
-    GList *apps, *l;
-    GSList *favs, *f;
-    BamfApplication *app;
-    BamfLauncherIcon *icon;
-    int priority = 0;
-    
-    _matcher = bamf_matcher_get_default ();
-    
-    favs = FavoriteStore::GetDefault ()->GetFavorites ();
-    
-    for (f = favs; f; f = f->next)
-    {
-        LauncherIcon *fav = CreateFavorite ((const char *) f->data);
-        
-        if (fav)
-        {
-            fav->SetSortPriority (priority);
-            RegisterIcon (fav);
-            priority++;
-        }
-    }
-    
-    apps = bamf_matcher_get_applications (_matcher);
-    g_signal_connect (_matcher, "view-opened", (GCallback) &LauncherController::OnViewOpened, this);
-    
-    for (l = apps; l; l = l->next)
-    {
-        app = BAMF_APPLICATION (l->data);
-        
-        if (g_object_get_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen")))
-          continue;
-        g_object_set_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen"), GINT_TO_POINTER (1));
-        
-        icon = new BamfLauncherIcon (_launcher, app, _screen);
-        icon->SetSortPriority (_sort_priority++);
-        RegisterIcon (icon);
-    }
+    icon->SetSortPriority (_sort_priority++);
+    RegisterIcon (icon);
+  }
 }
 

=== modified file 'src/LauncherController.h'
--- src/LauncherController.h	2010-11-24 18:59:55 +0000
+++ src/LauncherController.h	2010-11-25 07:36:29 +0000
@@ -43,7 +43,8 @@
     LauncherController(Launcher* launcher, CompScreen *screen, nux::BaseWindow* window);
     ~LauncherController();
 
-
+    void PresentIconOwningWindow (Window window);
+    
 private:
     BamfMatcher*     _matcher;
     CompAction*      _expo_action;

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2010-11-24 05:20:00 +0000
+++ src/LauncherIcon.cpp	2010-11-25 07:36:29 +0000
@@ -52,6 +52,8 @@
   _related_windows = 0;
 
   _background_color = nux::Color::White;
+  _glow_color = nux::Color::White;
+  
   _mouse_inside = false;
   _tooltip = new nux::Tooltip ();
   _icon_type = LAUNCHER_ICON_TYPE_NONE;
@@ -85,13 +87,18 @@
   return _background_color;
 }
 
+nux::Color LauncherIcon::GlowColor ()
+{
+  return _glow_color;
+}
+
 nux::BaseTexture * LauncherIcon::TextureForSize (int size)
 {
   nux::BaseTexture * result = GetTextureForSize (size);
   return result;
 }
 
-nux::Color LauncherIcon::ColorForIcon (GdkPixbuf *pixbuf)
+void LauncherIcon::ColorForIcon (GdkPixbuf *pixbuf, nux::Color &background, nux::Color &glow)
 {
   unsigned int width = gdk_pixbuf_get_width (pixbuf);
   unsigned int height = gdk_pixbuf_get_height (pixbuf);
@@ -136,8 +143,11 @@
   v = .85f;
   
   nux::HSVtoRGB (r, g, b, h, s, v);
+  background = nux::Color (r, g, b);
   
-  return nux::Color (r, g, b);
+  v = 1.0f;
+  nux::HSVtoRGB (r, g, b, h, s, v);
+  glow = nux::Color (r, g, b);
 }
 
 nux::BaseTexture * LauncherIcon::TextureFromGtkTheme (const char *icon_name, int size)
@@ -178,7 +188,7 @@
   if (GDK_IS_PIXBUF (pbuf))
   {
     result = nux::CreateTextureFromPixbuf (pbuf); 
-    _background_color = ColorForIcon (pbuf);
+    ColorForIcon (pbuf, _background_color, _glow_color);
   
     g_object_unref (pbuf);
   }
@@ -404,8 +414,13 @@
   return false;
 }
 
+int LauncherIcon::PresentUrgency ()
+{
+  return _present_urgency;
+}
+
 void 
-LauncherIcon::Present (int length)
+LauncherIcon::Present (int present_urgency, int length)
 {
   if (GetQuirk (LAUNCHER_ICON_QUIRK_PRESENTED))
     return;
@@ -413,6 +428,7 @@
   if (length >= 0)
     _present_time_handle = g_timeout_add (length, &LauncherIcon::OnPresentTimeout, this);
   
+  _present_urgency = present_urgency;
   SetQuirk (LAUNCHER_ICON_QUIRK_PRESENTED, true);
 }
 
@@ -486,8 +502,10 @@
   needs_redraw.emit (this);
   
   // Present on urgent as a general policy
-  if ((quirk == LAUNCHER_ICON_QUIRK_URGENT || quirk == LAUNCHER_ICON_QUIRK_VISIBLE) && value)
-    Present (1500);
+  if (quirk == LAUNCHER_ICON_QUIRK_VISIBLE && value)
+    Present (0, 1500);
+  if (quirk == LAUNCHER_ICON_QUIRK_URGENT && value)
+    Present (1, 1500);
 }
 
 void

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2010-11-24 02:13:08 +0000
+++ src/LauncherIcon.h	2010-11-25 07:36:29 +0000
@@ -88,6 +88,7 @@
     int SortPriority ();
     
     int RelatedWindows ();
+    int PresentUrgency ();
     
     bool GetQuirk (LauncherIconQuirk quirk);
     struct timespec GetQuirkTime (LauncherIconQuirk quirk);
@@ -95,11 +96,13 @@
     LauncherIconType Type ();
     
     nux::Color BackgroundColor ();
+    nux::Color GlowColor ();
     
     nux::BaseTexture * TextureForSize (int size);
     
     std::list<DbusmenuClient *> Menus ();
     
+    
     sigc::signal<void, int> MouseDown;
     sigc::signal<void, int> MouseUp;
     sigc::signal<void>      MouseEnter;
@@ -119,7 +122,8 @@
     void SetRelatedWindows (int windows);
     void Remove ();
     
-    void Present (int length);
+    
+    void Present (int urgency, int length);
     void Unpresent ();
     
     void SetIconType (LauncherIconType type);
@@ -129,6 +133,7 @@
     virtual nux::BaseTexture * GetTextureForSize (int size) = 0;
     
     virtual void OnCenterStabilized (nux::Point3 center) {};
+    virtual bool IconOwnsWindow (Window w) { return false; }
 
     nux::BaseTexture * TextureFromGtkTheme (const char *name, int size);
 
@@ -161,11 +166,13 @@
     static gboolean OnPresentTimeout (gpointer data);
     static gboolean OnCenterTimeout (gpointer data);
 
-    nux::Color ColorForIcon (GdkPixbuf *pixbuf);
+    void ColorForIcon (GdkPixbuf *pixbuf, nux::Color &background, nux::Color &glow);
 
     nux::Color       _background_color;
+    nux::Color       _glow_color;
     int              _sort_priority;
     int              _related_windows;
+    int              _present_urgency;
     guint            _present_time_handle;
     guint            _center_stabilize_handle;
     bool             _quicklist_is_initialized;

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-11-24 17:53:21 +0000
+++ src/unity.cpp	2010-11-25 07:36:29 +0000
@@ -57,7 +57,6 @@
 {
     /* At the end of every function, you must call BaseClass->functionName (args) in order to pass on
      * the call chain */
-
     cScreen->preparePaint (ms);
 }
 
@@ -125,6 +124,7 @@
     bool ret;
 
     doShellRepaint = true;
+    allowWindowPaint = true;
 
     /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
     ret = gScreen->glPaintOutput (attrib, transform, region, output, mask);
@@ -145,6 +145,7 @@
 			      		 CompOutput 		*output, // Output properties. Use this to the get output width and height for the output being painted
 			      		 unsigned int		mask /* Some other paint properties, see opengl.h */)
 {
+    allowWindowPaint = false;
     /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
     gScreen->glPaintOutput (attrib, transform, region, output, mask);
 }
@@ -269,7 +270,7 @@
 			     const CompRegion 	&region,
 			     unsigned int	mask)
 {
-    if (uScreen->doShellRepaint)
+    if (uScreen->doShellRepaint && uScreen->allowWindowPaint)
     {
 	const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
 
@@ -381,6 +382,9 @@
 void
 UnityWindow::windowNotify (CompWindowNotify n)
 {
+    if (n == CompWindowNotifyMinimize)
+        uScreen->controller->PresentIconOwningWindow (window->id ());
+
     window->windowNotify (n);
 }
 

=== modified file 'src/unity.h'
--- src/unity.h	2010-11-24 17:53:21 +0000
+++ src/unity.h	2010-11-25 07:36:29 +0000
@@ -160,6 +160,7 @@
 	initPluginForScreen (CompPlugin *p);
 
 	bool			doShellRepaint;
+	bool      allowWindowPaint;
 
     protected:
 
@@ -190,14 +191,16 @@
 	static gboolean 
 	strutHackTimeout (gpointer data);
 	
-	Launcher               			*launcher;
-	LauncherController    	 		*controller;
-	PanelView              			*panelView;
-	nux::WindowThread      			*wt;
-	nux::BaseWindow        			*launcherWindow;
-	nux::BaseWindow        			*panelWindow;
-	nux::Geometry                   lastTooltipArea;
+	Launcher               *launcher;
+	LauncherController     *controller;
+	PanelView              *panelView;
+	nux::WindowThread      *wt;
+	nux::BaseWindow        *launcherWindow;
+	nux::BaseWindow        *panelWindow;
+	nux::Geometry           lastTooltipArea;
 	IntrospectionDBusInterface 		*debugger;
+
+  friend class UnityWindow;
 };
 
 class UnityWindow :