Merge lp:~azzar1/unity/fix-687956-682787 into lp:unity

[Andrea Azzarone]

[Jason Smith (jassmith)]

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-05-26 13:11:05 +0000
+++ src/Launcher.cpp	2011-05-27 20:08:24 +0000
@@ -3130,6 +3130,7 @@
 {
   SetMousePosition (x, y);
   SetStateMouseOverLauncher (false);
+  LauncherIcon::SetSkipTooltipDelay (false);
 
   EventLogic ();
   EnsureAnimation ();
 
=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-05-23 09:51:57 +0000
+++ src/LauncherIcon.cpp	2011-05-27 20:08:24 +0000
@@ -54,6 +54,7 @@
 
 int LauncherIcon::_current_theme_is_mono = -1;
 GtkIconTheme *LauncherIcon::_unity_theme = NULL;
+gboolean LauncherIcon::_skip_tooltip_delay = false;
 
 LauncherIcon::LauncherIcon(Launcher* launcher)
 {
@@ -92,6 +93,7 @@
   _present_time_handle = 0;
   _center_stabilize_handle = 0;
   _time_delay_handle = 0;
+  _tooltip_delay_handle = 0;
   
 
   // FIXME: the abstraction is already broken, should be fixed for O
@@ -129,6 +131,10 @@
   if (_time_delay_handle)
     g_source_remove (_time_delay_handle);
   _time_delay_handle = 0;
+  
+  if (_tooltip_delay_handle)
+    g_source_remove (_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
 
   if (_superkey_label)
     _superkey_label->UnReference ();
@@ -471,6 +477,33 @@
 }
 
 void
+LauncherIcon::SetSkipTooltipDelay (gboolean skip_tooltip_delay)
+{
+  _skip_tooltip_delay = skip_tooltip_delay;
+}
+
+gboolean
+LauncherIcon::OnTooltipTimeout (gpointer data)
+{
+  LauncherIcon *self = (LauncherIcon *) data;
+  
+  nux::Geometry geo = self->_launcher->GetAbsoluteGeometry ();
+  int tip_x = geo.x + geo.width + 1;
+  int tip_y = geo.y + self->_center.y;
+          
+  self->_tooltip->ShowTooltipWithTipAt (tip_x, tip_y);
+  
+  if (!self->_quicklist->IsVisible ())
+  {
+    self->_tooltip->ShowWindow (!self->m_TooltipText.IsEmpty ());
+    _skip_tooltip_delay = true;
+  }
+  
+  self->_tooltip_delay_handle = 0;
+  return false;
+}
+
+void
 LauncherIcon::RecvMouseEnter ()
 {
   if (QuicklistManager::Default ()->Current ())
@@ -479,25 +512,28 @@
     return;
   }
   
-  nux::Geometry geo = _launcher->GetAbsoluteGeometry ();
-  int tip_x = geo.x + geo.width + 1;
-  int tip_y = geo.y + _center.y;
-          
-  _tooltip->ShowTooltipWithTipAt (tip_x, tip_y);
-  
-  if (!_quicklist->IsVisible ())
-  {
-    _tooltip->ShowWindow (true);
-  }
+  if (!_skip_tooltip_delay)
+    _tooltip_delay_handle = g_timeout_add (1000, &LauncherIcon::OnTooltipTimeout, this);
+  else
+    OnTooltipTimeout (this);
 }
 
 void LauncherIcon::RecvMouseLeave ()
-{
+{  
+  if (_tooltip_delay_handle)
+    g_source_remove (_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
+    
   _tooltip->ShowWindow (false);
 }
 
 gboolean LauncherIcon::OpenQuicklist (bool default_to_first_item)
 {
+   if (_tooltip_delay_handle)
+    g_source_remove (_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
+  _skip_tooltip_delay = false;
+
   _tooltip->ShowWindow (false);    
   _quicklist->RemoveAllMenuItem ();
 
@@ -579,6 +615,11 @@
 
 void LauncherIcon::HideTooltip ()
 {
+  if (_tooltip_delay_handle)
+    g_source_remove (_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
+  _skip_tooltip_delay = false;
+  
   _tooltip->ShowWindow (false);
 }
 
 
=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2011-04-20 09:40:45 +0000
+++ src/LauncherIcon.h	2011-05-27 20:08:24 +0000
@@ -149,6 +149,8 @@
     void SendDndEnter () { OnDndEnter (); }
     void SendDndLeave () { OnDndLeave (); }
     
+    static void SetSkipTooltipDelay (gboolean skip_tooltip_delay);
+    
     sigc::signal<void, int> MouseDown;
     sigc::signal<void, int> MouseUp;
     sigc::signal<void>      MouseEnter;
@@ -258,6 +260,7 @@
     static gboolean OnPresentTimeout (gpointer data);
     static gboolean OnCenterTimeout (gpointer data);
     static gboolean OnDelayedUpdateTimeout (gpointer data);
+    static gboolean OnTooltipTimeout (gpointer data);
 
     void ColorForIcon (GdkPixbuf *pixbuf, nux::Color &background, nux::Color &glow);
 
@@ -270,6 +273,8 @@
     guint            _present_time_handle;
     guint            _center_stabilize_handle;
     guint            _time_delay_handle;
+    guint            _tooltip_delay_handle;
+    static gboolean  _skip_tooltip_delay;
     bool             _quicklist_is_initialized;
     bool             _has_visible_window;
     bool             _remote_urgent;