Merge lp:~3v1n0/unity/ql-tooltip-fader into lp:unity

[Marco Trevisan (Treviño)]

LauncherIcon: don't try to show again quicklists or tooltip if center changed, just move them

Inside LauncherIcon we were trying to show again tooltips or quicklist when their center changed.
Now, we only move them to the new position.

[Brandon Schaefer (brandontschaefer)]

Yay it works normally!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3549
http://jenkins.qa.ubuntu.com/job/unity-ci/419/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/308
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/306/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/307

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/419/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-09-30 15:31:43 +0000
+++ launcher/LauncherIcon.cpp	2013-10-04 00:32:31 +0000
@@ -661,9 +661,9 @@
     tip_y = new_center.y;
 
     if (_quicklist && _quicklist->IsVisible())
-      QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+      QuicklistManager::Default()->MoveQuicklist(_quicklist, tip_x, tip_y);
     else if (_tooltip && _tooltip->IsVisible())
-      _tooltip->ShowTooltipWithTipAt(tip_x, tip_y);
+      _tooltip->SetTooltipPosition(tip_x, tip_y);
   }
 
   auto const& cb_func = sigc::mem_fun(this, &LauncherIcon::OnCenterStabilizeTimeout);

=== modified file 'launcher/QuicklistManager.cpp'
--- launcher/QuicklistManager.cpp	2013-09-24 02:03:12 +0000
+++ launcher/QuicklistManager.cpp	2013-10-04 00:32:31 +0000
@@ -78,11 +78,7 @@
                                      int tip_y, bool hide_existing_if_open)
 {
   if (_current_quicklist == quicklist)
-  {
-    // this quicklist is already active
-    // do we want to still redraw in case the position has changed?
     return;
-  }
 
   if (hide_existing_if_open && _current_quicklist)
   {
@@ -93,6 +89,11 @@
   nux::GetWindowCompositor().SetKeyFocusArea(quicklist.GetPointer());
 }
 
+void QuicklistManager::MoveQuicklist(nux::ObjectPtr<QuicklistView> const& quicklist, int x, int y)
+{
+  quicklist->SetQuicklistPosition(x, y);
+}
+
 void QuicklistManager::HideQuicklist(nux::ObjectPtr<QuicklistView> const& quicklist)
 {
   quicklist->Hide();

=== modified file 'launcher/QuicklistManager.h'
--- launcher/QuicklistManager.h	2013-09-11 16:47:48 +0000
+++ launcher/QuicklistManager.h	2013-10-04 00:32:31 +0000
@@ -39,9 +39,10 @@
 
   nux::ObjectPtr<QuicklistView> Current();
 
-  bool RegisterQuicklist(nux::ObjectPtr<QuicklistView> const& quicklist);
-  void ShowQuicklist(nux::ObjectPtr<QuicklistView> const& quicklist, int tip_x, int tip_y, bool hide_existing_if_open = true);
-  void HideQuicklist(nux::ObjectPtr<QuicklistView> const& quicklist);
+  bool RegisterQuicklist(nux::ObjectPtr<QuicklistView> const&);
+  void ShowQuicklist(nux::ObjectPtr<QuicklistView> const&, int x, int y, bool hide_existing_if_open = true);
+  void HideQuicklist(nux::ObjectPtr<QuicklistView> const&);
+  void MoveQuicklist(nux::ObjectPtr<QuicklistView> const&, int x, int y);
 
   void RecvShowQuicklist(nux::BaseWindow* window);
   void RecvHideQuicklist(nux::BaseWindow* window);

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2013-09-30 15:08:09 +0000
+++ launcher/QuicklistView.cpp	2013-10-04 00:32:31 +0000
@@ -324,10 +324,10 @@
   _enable_quicklist_for_testing = enable_testing;
 }
 
-void QuicklistView::ShowQuicklistWithTipAt(int anchor_tip_x, int anchor_tip_y)
+void QuicklistView::SetQuicklistPosition(int tip_x, int tip_y)
 {
-  _anchorX = anchor_tip_x;
-  _anchorY = anchor_tip_y;
+  _anchorX = tip_x;
+  _anchorY = tip_y;
 
   if (!_enable_quicklist_for_testing)
   {
@@ -356,14 +356,14 @@
       SetBaseXY(x, y);
     }
   }
+}
+
+void QuicklistView::ShowQuicklistWithTipAt(int x, int y)
+{
+  SetQuicklistPosition(x, y);
   Show();
 }
 
-void QuicklistView::ShowWindow(bool b, bool start_modal)
-{
-  unity::CairoBaseWindow::ShowWindow(b, start_modal);
-}
-
 void QuicklistView::Show()
 {
   if (!IsVisible())

=== modified file 'launcher/QuicklistView.h'
--- launcher/QuicklistView.h	2012-11-15 17:56:23 +0000
+++ launcher/QuicklistView.h	2013-10-04 00:32:31 +0000
@@ -55,8 +55,8 @@
 
   void RenderQuicklistView();
 
-  void ShowQuicklistWithTipAt(int anchor_tip_x, int anchor_tip_y);
-  virtual void ShowWindow(bool b, bool StartModal = false);
+  void SetQuicklistPosition(int x, int y);
+  void ShowQuicklistWithTipAt(int x, int y);
 
   void Show();
   void Hide();

=== modified file 'launcher/Tooltip.cpp'
--- launcher/Tooltip.cpp	2013-09-30 15:08:09 +0000
+++ launcher/Tooltip.cpp	2013-10-04 00:32:31 +0000
@@ -100,15 +100,20 @@
   return nullptr;
 }
 
-void Tooltip::ShowTooltipWithTipAt(int anchor_tip_x, int anchor_tip_y)
+void Tooltip::SetTooltipPosition(int tip_x, int tip_y)
 {
-  _anchorX = anchor_tip_x;
-  _anchorY = anchor_tip_y;
+  _anchorX = tip_x;
+  _anchorY = tip_y;
 
   int x = _anchorX - PADDING;
-  int y = anchor_tip_y - ANCHOR_HEIGHT / 2 - TOP_SIZE - CORNER_RADIUS - PADDING;
+  int y = _anchorY - ANCHOR_HEIGHT / 2 - TOP_SIZE - CORNER_RADIUS - PADDING;
 
   SetBaseXY(x, y);
+}
+
+void Tooltip::ShowTooltipWithTipAt(int x, int y)
+{
+  SetTooltipPosition(x, y);
   Show();
 }
 

=== modified file 'launcher/Tooltip.h'
--- launcher/Tooltip.h	2012-12-14 12:14:34 +0000
+++ launcher/Tooltip.h	2013-10-04 00:32:31 +0000
@@ -44,7 +44,8 @@
   void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
   void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
 
-  void ShowTooltipWithTipAt(int anchor_tip_x, int anchor_tip_y);
+  void SetTooltipPosition(int x, int y);
+  void ShowTooltipWithTipAt(int x, int y);
 
   // Introspection
   std::string GetName() const;