Merge lp:~azzar1/unity/fix-bug-955158-5.0 into lp:unity/5.0

[Andrea Azzarone]

Backport lp:~andyrock/unity/fix-bug-955158

== Problem ==
padding between last quicklist item and bottom edge is non-deterministic (changes randomly)

== Test ==
Not applicable: visual change.

[Tim Penhey (thumper)]

review: Approve

=== modified file 'plugins/unityshell/src/QuicklistView.cpp'
--- plugins/unityshell/src/QuicklistView.cpp	2012-04-13 13:20:05 +0000
+++ plugins/unityshell/src/QuicklistView.cpp	2012-07-04 06:13:21 +0000
@@ -65,8 +65,6 @@
   , _corner_radius(4)
   , _padding(13)
   , _left_padding_correction(-1)
-  , _bottom_padding_correction_normal(-2)
-  , _bottom_padding_correction_single_item(-4)
   , _offset_correction(-1)
   , _cairo_text_has_changed(true)
   , _current_item_index(-1)
@@ -101,8 +99,6 @@
   _item_layout     = new nux::VLayout(TEXT(""), NUX_TRACKER_LOCATION);
   _vlayout->AddLayout(_item_layout, 0);
 
-  _default_item_layout = new nux::VLayout(TEXT(""), NUX_TRACKER_LOCATION);
-  _vlayout->AddLayout(_default_item_layout, 0);
   _vlayout->AddLayout(_bottom_space, 0);
   _vlayout->SetMinimumWidth(140);
 
@@ -329,14 +325,6 @@
     (*it)->UnReference();
   }
 
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    // Remove from introspection
-    RemoveChild(*it);
-    (*it)->UnReference();
-  }
-
-  _default_item_list.clear();
   _item_list.clear();
 }
 
@@ -353,7 +341,7 @@
 
   if (!_enable_quicklist_for_testing)
   {
-    if ((_item_list.size() != 0) || (_default_item_list.size() != 0))
+    if ((_item_list.size() != 0))
     {
       int offscreen_size = GetBaseY() +
                            GetBaseHeight() -
@@ -441,12 +429,6 @@
       (*it)->ProcessDraw(gfxContext, forceDraw);
   }
 
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    if ((*it)->GetVisible())
-      (*it)->ProcessDraw(gfxContext, forceDraw);
-  }
-
   gfxContext.PopClippingRectangle();
 }
 
@@ -475,45 +457,34 @@
     (*it)->GetTextExtents(textWidth, textHeight);
     if (textWidth > MaxItemWidth)
       MaxItemWidth = textWidth;
-    TotalItemHeight += textHeight;
-  }
-
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    // Make sure item is in layout if it should be
-    if (!(*it)->GetVisible())
-    {
-      _default_item_layout->RemoveChildObject(*it);
-      continue;
-    }
-    else if (!(*it)->GetParentObject())
-      _default_item_layout->AddView(*it, 1, nux::eCenter, nux::eFull);
-
-    int  textWidth  = 0;
-    int  textHeight = 0;
-    (*it)->GetTextExtents(textWidth, textHeight);
-    if (textWidth > MaxItemWidth)
-      MaxItemWidth = textWidth;
+    textHeight += QuicklistMenuItem::ITEM_MARGIN * 2;
     TotalItemHeight += textHeight;
   }
 
   if (TotalItemHeight < _anchor_height)
   {
-    _top_space->SetMinMaxSize(1, (_anchor_height - TotalItemHeight) / 2 + 1 + _padding + _corner_radius);
-    _bottom_space->SetMinMaxSize(1, (_anchor_height - TotalItemHeight) / 2 + 1 +
-                                     _padding + _corner_radius +
-                                     _bottom_padding_correction_single_item);
+    int b = (_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius;
+    int t = b + _offset_correction;
+
+    _top_space->SetMinimumHeight(t);
+    _top_space->SetMaximumHeight(t);
+
+    _bottom_space->SetMinimumHeight(b);
+    _bottom_space->SetMaximumHeight(b);
   }
   else
   {
-    _top_space->SetMinMaxSize(_padding + _corner_radius, _padding + _corner_radius);
-    _bottom_space->SetMinMaxSize(_padding + _corner_radius - 2,
-                                 _padding + _corner_radius +
-                                 _bottom_padding_correction_normal);
+    int b = _padding + _corner_radius;
+    int t = b + _offset_correction;
+
+    _top_space->SetMinimumHeight(t);
+    _top_space->SetMaximumHeight(t);
+
+    _bottom_space->SetMinimumHeight(b);
+    _bottom_space->SetMaximumHeight(b);
   }
 
   _item_layout->SetMinimumWidth(MaxItemWidth);
-  _default_item_layout->SetMinimumWidth(MaxItemWidth);
 
   BaseWindow::PreLayoutManagement();
 }
@@ -525,7 +496,7 @@
   UpdateTexture();
 
   int x = _padding + _anchor_width + _corner_radius + _offset_correction;
-  int y = _padding + _corner_radius + _offset_correction;
+  int y = _top_space->GetMinimumHeight();
 
   std::list<QuicklistMenuItem*>::iterator it;
   for (it = _item_list.begin(); it != _item_list.end(); it++)
@@ -539,23 +510,12 @@
     y += (*it)->GetBaseHeight();
   }
 
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    if (!(*it)->GetVisible())
-      continue;
-
-    (*it)->SetBaseX(x);
-    (*it)->SetBaseY(y);
-
-    y += (*it)->GetBaseHeight();
-  }
-
   // We must correct the width of line separators. The rendering of the separator can be smaller than the width of the
   // quicklist. The reason for that is, the quicklist width is determined by the largest entry it contains. That size is
   // only after MaxItemWidth is computed in QuicklistView::PreLayoutManagement.
   // The setting of the separator width is done here after the Layout cycle for this widget is over. The width of the separator
   // has bee set correctly during the layout cycle, but the cairo rendering still need to be adjusted.
-  int separator_width = nux::Max<int>(_default_item_layout->GetBaseWidth(), _item_layout->GetBaseWidth());
+  int separator_width = _item_layout->GetBaseWidth();
 
   for (it = _item_list.begin(); it != _item_list.end(); it++)
   {
@@ -567,16 +527,6 @@
     }
   }
 
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    QuicklistMenuItem* item = (QuicklistMenuItem*)(*it);
-    if (item->GetVisible() && item->CairoSurfaceWidth() != separator_width)
-    {
-      // Compute textures of the item.
-      item->UpdateTexture();
-    }
-  }
-
   return result;
 }
 
@@ -623,24 +573,6 @@
       }
     }
   }
-
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    if (!(*it)->GetVisible())
-      continue;
-
-    geo = (*it)->GetGeometry();
-    geo.width = _default_item_layout->GetBaseWidth();
-
-    if (geo.IsPointInside(x, y))
-    {
-      // An action is performed: send the signal back to the application
-      if ((*it)->_menuItem)
-      {
-        dbusmenu_menuitem_handle_event((*it)->_menuItem, "clicked", NULL, 0);
-      }
-    }
-  }
 }
 
 void QuicklistView::RecvItemMouseRelease(QuicklistMenuItem* item, int x, int y)
@@ -664,11 +596,6 @@
   {
     (*it)->_prelight = false;
   }
-
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    (*it)->_prelight = false;
-  }
 }
 
 void QuicklistView::RecvItemMouseDrag(QuicklistMenuItem* item, int x, int y)
@@ -690,22 +617,6 @@
       SelectItem(item_index);
     }
   }
-
-  for (auto it : _default_item_list)
-  {
-    int item_index = GetItemIndex(it);
-
-    if (!IsMenuItemSelectable(item_index))
-      continue;
-
-    geo = it->GetGeometry();
-    geo.width = _default_item_layout->GetBaseWidth();
-
-    if (geo.IsPointInside(x + item->GetBaseX(), y + item->GetBaseY()))
-    {
-      SelectItem(item_index);
-    }
-  }
 }
 
 void QuicklistView::RecvItemMouseEnter(QuicklistMenuItem* item)
@@ -773,18 +684,9 @@
     (*it)->UnReference();
   }
 
-  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
-  {
-    // Remove from introspection
-    RemoveChild(*it);
-    (*it)->UnReference();
-  }
-
   _item_list.clear();
-  _default_item_list.clear();
 
   _item_layout->Clear();
-  _default_item_layout->Clear();
   _cairo_text_has_changed = true;
   nux::GetWindowThread()->QueueObjectLayout(this);
 }
@@ -819,7 +721,7 @@
 
 int QuicklistView::GetNumItems()
 {
-  return _item_list.size() + _default_item_list.size();
+  return _item_list.size();
 }
 
 QuicklistMenuItem* QuicklistView::GetNthItems(int index)
@@ -835,19 +737,6 @@
     }
   }
 
-  if (index < (int)_item_list.size() + (int)_default_item_list.size())
-  {
-    int i = 0;
-    if (_item_list.size() > 0)
-      i = _item_list.size() - 1;
-    std::list<QuicklistMenuItem*>::iterator it;
-    for (it = _default_item_list.begin(); it != _default_item_list.end(); i++, it++)
-    {
-      if (i == index)
-        return *it;
-    }
-  }
-
   return nullptr;
 }
 
@@ -863,14 +752,6 @@
       return index;
   }
 
-  for (auto it : _default_item_list)
-  {
-    ++index;
-
-    if (it == item)
-      return index;
-  }
-
   return index;
 }
 
@@ -1304,7 +1185,7 @@
 
   if (!_enable_quicklist_for_testing)
   {
-    if (!_item_list.empty() || !_default_item_list.empty())
+    if (!_item_list.empty())
     {
       int offscreen_size = GetBaseY() +
                            height -

=== modified file 'plugins/unityshell/src/QuicklistView.h'
--- plugins/unityshell/src/QuicklistView.h	2012-04-11 15:49:58 +0000
+++ plugins/unityshell/src/QuicklistView.h	2012-07-04 06:13:21 +0000
@@ -151,13 +151,10 @@
   float _corner_radius;
   float _padding;
   float _left_padding_correction;
-  float _bottom_padding_correction_normal;
-  float _bottom_padding_correction_single_item;
   float _offset_correction;
   nux::HLayout* _hlayout;
   nux::VLayout* _vlayout;
   nux::VLayout* _item_layout;
-  nux::VLayout* _default_item_layout;
   nux::SpaceLayout* _left_space;  //!< Space from the left of the widget to the left of the text.
   nux::SpaceLayout* _right_space; //!< Space from the right of the text to the right of the widget.
   nux::SpaceLayout* _top_space;  //!< Space from the left of the widget to the left of the text.
@@ -166,7 +163,6 @@
   bool _cairo_text_has_changed;
   void UpdateTexture();
   std::list<QuicklistMenuItem*> _item_list;
-  std::list<QuicklistMenuItem*> _default_item_list;
 
   // used by keyboard/a11y-navigation
   int _current_item_index;