Merge lp:~canonical-dx-team/unity/unity.fix-691114 into lp:unity

[Mirco Müller]

Avoid Quicklists being positioned so that they are partially offscreen at the bottom screen-edge. Fixes LP: #691114

[Mirco Müller (macslow)]

There's still a bug in the layout-calculation for the base-geometry in Nux (around BaseWindow::ShowWindow). That needs to be solved first to take advantage of this fix here.

[Jay Taoko (jaytaoko)]

The fix is not Nux related. We just needed to correct the Quicklist position in QuicklistView::ShowQuicklistWithTipAt the same way we do it in QuicklistView::UpdateTexture ().

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-01-07 16:37:51 +0000
+++ src/Launcher.cpp	2011-01-11 01:23:10 +0000
@@ -1475,6 +1475,9 @@
 
 void Launcher::DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg const &arg, nux::Geometry geo)
 {
+  if (arg.icon->TextureForSize (_icon_image_size) == 0)
+    return;
+
   GfxContext.GetRenderStates ().SetSeparateBlend (true,
                                                 GL_SRC_ALPHA,
                                                 GL_ONE_MINUS_SRC_ALPHA,

=== modified file 'src/QuicklistView.cpp'
--- src/QuicklistView.cpp	2011-01-07 16:37:51 +0000
+++ src/QuicklistView.cpp	2011-01-11 01:23:10 +0000
@@ -137,21 +137,39 @@
 
 void QuicklistView::ShowQuicklistWithTipAt (int anchor_tip_x, int anchor_tip_y)
 {
-  int window_width;
-  int window_height;
-  
-  window_width = nux::GetWindow ().GetWindowWidth ();
-  window_height = nux::GetWindow ().GetWindowHeight ();
-  
   _anchorX = anchor_tip_x;
   _anchorY = anchor_tip_y;
   
-  int x = _anchorX - _padding;
-  int y = anchor_tip_y - _anchor_height/2 - _top_size - _corner_radius - _padding;
-  
-  SetBaseX (x);
-  SetBaseY (y);
-  
+  if (!_enable_quicklist_for_testing)
+  {
+    if ((_item_list.size () != 0) || (_default_item_list.size () != 0))
+    {
+      int offscreen_size = GetBaseY () +
+                           GetBaseHeight () -
+                           nux::GetWindow().GetWindowHeight ();
+
+      if (offscreen_size > 0)
+        _top_size = offscreen_size;
+      else
+        _top_size = 4;
+
+      int x = _anchorX - _padding;
+      int y = _anchorY - _anchor_height/2 - _top_size - _corner_radius - _padding;
+
+      SetBaseX (x);
+      SetBaseY (y);
+    }
+    else
+    {
+      _top_size = 0;
+      int x = _anchorX - _padding;
+      int y = _anchorY - _anchor_height/2 - _top_size - _corner_radius - _padding;
+
+      SetBaseX (x);
+      SetBaseY (y);    
+    }
+  }
+
   Show ();
 }
 
@@ -1271,13 +1289,21 @@
   if (_cairo_text_has_changed == false)
     return;
 
-  int size_above_anchor = -1; // equal to sise below
+  int size_above_anchor = -1; // equal to size below
 
   if (!_enable_quicklist_for_testing)
   {
     if ((_item_list.size () != 0) || (_default_item_list.size () != 0))
     {
-      _top_size = 4;
+      int offscreen_size = GetBaseY () +
+                           GetBaseHeight () -
+                           nux::GetWindow().GetWindowHeight ();
+
+      if (offscreen_size > 0)
+        _top_size = offscreen_size;
+      else
+        _top_size = 4;
+
       size_above_anchor = _top_size;
       int x = _anchorX - _padding;
       int y = _anchorY - _anchor_height/2 - _top_size - _corner_radius - _padding;