Merge lp:~3v1n0/unity/quicklist-item-glow-selection into lp:unity

[Marco Trevisan (Treviño)]

Fixed bug #911443 applying a glow to the quicklist item selection.

The glow is applied using some heuristic, since from dozen of tests I've done this seems the best result so far.

Also, the disabled items are now using a different opacity, following the design mokup.

Here you are some examples to show of how this branch works:
 - http://go.3v1n0.net/xJRglg
 - http://go.3v1n0.net/xIXzcd

[MC Return (mc-return)]

Looks very nice.
Will we see that merged soon ?

[Marco Trevisan (Treviño) (3v1n0)]

Unfortunately not... Design decisions have been changed.

[MC Return (mc-return)]

:(

Unmerged revisions

1803. By Marco Trevisan (Treviño) on 2012-01-03

QuicklistMenuItem*: add a shared function to Draw the Prelight that applies a blurred glow

All the kinds of QuicklistMenuitems now uses the shared DrawText and DrawPrelight functions
to draw the content, these functions are also aware of the padding that the quicklist item
should use.

The DrawPrelight function uses some heuristic to get the best result, instead of just drawing
a blurred rectangle under the opaque one.

Plus, now the disabled quicklist are using a semi-transparent white color, computed comaparing
the results with the design mokups.

1802. By Marco Trevisan (Treviño) on 2012-01-03

QuicklistView: don't define the padding of each MenuItemView, leave the children to set it

The quicklist view shouldn't define the padding of each child, but each one should take all the
space and then draw there what it wants. This allows to use all the quicklist space on the menu items
and to draw a glow without reducing the item area.

=== modified file 'plugins/unityshell/src/QuicklistMenuItem.cpp'
--- plugins/unityshell/src/QuicklistMenuItem.cpp	2011-12-14 21:12:28 +0000
+++ plugins/unityshell/src/QuicklistMenuItem.cpp	2012-01-03 21:46:26 +0000
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
- * Authored by: Jay Taoko <[e-mail]>
+ *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  */
 
 #include <gdk/gdk.h>
@@ -134,8 +135,8 @@
   int textWidth = 1;
   int textHeight = 1;
   GetTextExtents(textWidth, textHeight);
-  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 3 * ITEM_MARGIN,
-                 textHeight + 2 * ITEM_MARGIN);
+  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 4 * ITEM_MARGIN + 2 * ITEM_PADDING,
+                 textHeight + 2 * ITEM_MARGIN + 2 * ITEM_PADDING);
 }
 
 QuicklistMenuItemType QuicklistMenuItem::GetItemType()
@@ -370,15 +371,12 @@
   sigMouseLeave.emit(this);
 }
 
-void
-QuicklistMenuItem::DrawText(cairo_t*   cr,
-                            int        width,
-                            int        height,
-                            nux::Color color)
+void QuicklistMenuItem::DrawText(nux::CairoGraphics *cairo, int width, int height, nux::Color color)
 {
-  if (_text == NULL)
+  if (_text == nullptr || cairo == nullptr)
     return;
 
+  cairo_t*              cr         = cairo->GetContext();
   int                   textWidth  = 0;
   int                   textHeight = 0;
   PangoLayout*          layout     = NULL;
@@ -392,6 +390,8 @@
   g_object_get(settings, "gtk-font-name", &fontName, NULL);
   GetTextExtents(fontName, textWidth, textHeight);
 
+  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source_rgba(cr, color.red, color.blue, color.green, color.alpha);
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
   layout = pango_cairo_create_layout(cr);
   desc = pango_font_description_from_string(fontName);
@@ -417,7 +417,7 @@
   pango_layout_context_changed(layout);
 
   cairo_move_to(cr,
-                2 * ITEM_MARGIN + ITEM_INDENT_ABS,
+                ITEM_MARGIN + ITEM_PADDING + ITEM_INDENT_ABS,
                 (float)(height - textHeight) / 2.0f);
   pango_cairo_show_layout(cr, layout);
 
@@ -427,6 +427,50 @@
   g_object_unref(layout);
 }
 
+void QuicklistMenuItem::DrawPrelight(nux::CairoGraphics *cairo, int width, int height, nux::Color color)
+{
+  if (!cairo)
+    return;
+
+  /* The item prelight should be a blurred rounded rectangle, however to get 
+   * the best result so far, instead of just drawing a blurred rectangle and
+   * an opaque one, we firstly manually create a kind of gradient of the
+   * shape redrawing the rectangle of different dimensions and with different
+   * opacities, then we blur the results and we finally draw the opauqe
+   * rectangle */
+  cairo_t* cr = cairo->GetContext();
+  const double max_glow_opacity = 0.4f * color.alpha;
+  const double opacity_step = max_glow_opacity/ITEM_PADDING;
+
+  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+
+  for (int i = 0; i <= ITEM_PADDING; ++i)
+  {
+    double opacity;
+
+    switch (i) {
+      case 0:
+        opacity = opacity_step / 2.0f;
+        break;
+      case ITEM_PADDING:
+        opacity = color.alpha;
+        break;
+      default:
+        opacity = opacity_step * (i + 1.0f);
+    }
+
+    cairo_set_source_rgba(cr, color.red, color.blue, color.green, opacity);
+    cairo->DrawRoundedRectangle(cr, 1.0f, i + 1, i,
+                                ITEM_CORNER_RADIUS_ABS+(ITEM_PADDING-i),
+                                width - (i + 1) * 2, height - (i) * 2);
+
+    if (i == ITEM_PADDING-1)
+      cairo->BlurSurface(1);
+
+    cairo_fill(cr);
+  }
+}
+
 void
 QuicklistMenuItem::EnableLabelMarkup(bool enabled)
 {

=== modified file 'plugins/unityshell/src/QuicklistMenuItem.h'
--- plugins/unityshell/src/QuicklistMenuItem.h	2011-12-14 21:12:28 +0000
+++ plugins/unityshell/src/QuicklistMenuItem.h	2012-01-03 21:46:26 +0000
@@ -35,7 +35,8 @@
 
 #define ITEM_INDENT_ABS        16
 #define ITEM_CORNER_RADIUS_ABS 3
-#define ITEM_MARGIN            4
+#define ITEM_MARGIN            3
+#define ITEM_PADDING           3
 
 typedef enum
 {
@@ -135,10 +136,8 @@
 
   bool _prelight;   //!< True when the mouse is over the item.
 
-  void DrawText(cairo_t*   cr,
-                int        width,
-                int        height,
-                nux::Color color);
+  void DrawText(nux::CairoGraphics *cairo, int width, int height, nux::Color color);
+  void DrawPrelight(nux::CairoGraphics *cairo, int width, int height, nux::Color color);
 
   // Introspection
   std::string _name;

=== modified file 'plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp'
--- plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp	2012-01-03 21:46:26 +0000
+++ plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp	2012-01-03 21:46:26 +0000
@@ -140,7 +140,7 @@
     texture = _prelightTexture[texture_idx]->GetDeviceTexture();
   }
 
-  _color = GetEnabled() ? nux::color::White : nux::Color(0.8f, 0.8f, 0.8f, 1.0f);
+  _color = GetEnabled() ? nux::color::White : nux::color::White * 0.35;
 
   gfxContext.QRP_1Tex(base.x,
                       base.y,
@@ -168,7 +168,6 @@
 void
 QuicklistMenuItemCheckmark::UpdateTexture()
 {
-  nux::Color transparent = nux::Color(0.0f, 0.0f, 0.0f, 0.0f);
   int        width       = GetBaseWidth();
   int        height      = GetBaseHeight();
 
@@ -184,7 +183,7 @@
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_set_line_width(cr, 1.0f);
 
-  DrawText(cr, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White);
 
   if (_normalTexture[0])
     _normalTexture[0]->UnReference();
@@ -201,7 +200,7 @@
 
   cairo_save(cr);
   cairo_translate(cr,
-                  _align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN) / 2.0f),
+                  _align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN + ITEM_PADDING) / 2.0f),
                   _align(((double) height - 16.0f) / 2.0f));
 
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
@@ -221,7 +220,7 @@
 
   cairo_restore(cr);
 
-  DrawText(cr, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White);
 
   if (_normalTexture[1])
     _normalTexture[1]->UnReference();
@@ -232,23 +231,8 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  _cairoGraphics->DrawRoundedRectangle(cr,
-                                       1.0f,
-                                       0.5f,
-                                       0.5f,
-                                       ITEM_CORNER_RADIUS_ABS,
-                                       width - 1.0f,
-                                       height - 1.0f);
-  cairo_fill(cr);
-
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
-
-  DrawText(cr, width, height, transparent);
+  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
 
   if (_prelightTexture[0])
     _prelightTexture[0]->UnReference();
@@ -259,25 +243,13 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  _cairoGraphics->DrawRoundedRectangle(cr,
-                                       1.0f,
-                                       0.5f,
-                                       0.5f,
-                                       ITEM_CORNER_RADIUS_ABS,
-                                       width - 1.0f,
-                                       height - 1.0f);
-  cairo_fill(cr);
+  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
 
   cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
 
   cairo_save(cr);
   cairo_translate(cr,
-                  _align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN) / 2.0f),
+                  _align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN + ITEM_PADDING) / 2.0f),
                   _align(((double) height - 16.0f) / 2.0f));
 
   cairo_translate(cr, 3.0f, 1.0f);
@@ -295,7 +267,7 @@
 
   cairo_restore(cr);
 
-  DrawText(cr, width, height, transparent);
+  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
 
   if (_prelightTexture[1])
     _prelightTexture[1]->UnReference();
@@ -303,6 +275,7 @@
   _prelightTexture[1] = texture_from_cairo_graphics(*_cairoGraphics);
 
   // finally clean up
+  cairo_destroy(cr);
   delete _cairoGraphics;
 }
 

=== modified file 'plugins/unityshell/src/QuicklistMenuItemLabel.cpp'
--- plugins/unityshell/src/QuicklistMenuItemLabel.cpp	2011-12-14 21:12:28 +0000
+++ plugins/unityshell/src/QuicklistMenuItemLabel.cpp	2012-01-03 21:46:26 +0000
@@ -134,7 +134,7 @@
   else
   {
     texture = _normalTexture[0]->GetDeviceTexture();
-    _color = nux::Color(0.8f, 0.8f, 0.8f, 1.0f);
+    _color = nux::color::White * 0.35;
   }
 
   gfxContext.QRP_1Tex(base.x,
@@ -165,7 +165,6 @@
 void
 QuicklistMenuItemLabel::UpdateTexture()
 {
-  nux::Color transparent = nux::Color(0.0f, 0.0f, 0.0f, 0.0f);
   int        width       = GetBaseWidth();
   int        height      = GetBaseHeight();
 
@@ -176,12 +175,7 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  DrawText(cr, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White);
 
   if (_normalTexture[0])
     _normalTexture[0]->UnReference();
@@ -192,23 +186,8 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  _cairoGraphics->DrawRoundedRectangle(cr,
-                                       1.0f,
-                                       0.5f,
-                                       0.5f,
-                                       ITEM_CORNER_RADIUS_ABS,
-                                       width - 1.0f,
-                                       height - 1.0f);
-  cairo_fill(cr);
-
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
-
-  DrawText(cr, width, height, transparent);
+  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
 
   if (_prelightTexture[0])
     _prelightTexture[0]->UnReference();
@@ -216,6 +195,7 @@
   _prelightTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
 
   // finally clean up
+  cairo_destroy(cr);
   delete _cairoGraphics;
 }
 

=== modified file 'plugins/unityshell/src/QuicklistMenuItemRadio.cpp'
--- plugins/unityshell/src/QuicklistMenuItemRadio.cpp	2012-01-03 21:46:26 +0000
+++ plugins/unityshell/src/QuicklistMenuItemRadio.cpp	2012-01-03 21:46:26 +0000
@@ -139,7 +139,7 @@
     texture = _prelightTexture[texture_idx]->GetDeviceTexture();
   }
 
-  _color = GetEnabled() ? nux::color::White : nux::Color(0.8f, 0.8f, 0.8f, 1.0f);
+  _color = GetEnabled() ? nux::color::White : nux::color::White * 0.35;
 
   gfxContext.QRP_1Tex(base.x,
                       base.y,
@@ -169,7 +169,6 @@
 void
 QuicklistMenuItemRadio::UpdateTexture()
 {
-  nux::Color transparent = nux::Color(0.0f, 0.0f, 0.0f, 0.0f);
   int        width       = GetBaseWidth();
   int        height      = GetBaseHeight();
 
@@ -180,12 +179,7 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  DrawText(cr, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White);
 
   if (_normalTexture[0])
     _normalTexture[0]->UnReference();
@@ -201,7 +195,7 @@
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_set_line_width(cr, 1.0f);
 
-  double x      = _align((ITEM_INDENT_ABS + ITEM_MARGIN) / 2.0f);
+  double x      = _align((ITEM_INDENT_ABS + ITEM_MARGIN + ITEM_PADDING) / 2.0f);
   double y      = _align((double) height / 2.0f);
   double radius = 3.5f;
 
@@ -209,8 +203,7 @@
   cairo_arc(cr, x, y, radius, 0.0f * (G_PI / 180.0f), 360.0f * (G_PI / 180.0f));
   cairo_fill(cr);
 
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  DrawText(cr, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White);
 
   if (_normalTexture[1])
     _normalTexture[1]->UnReference();
@@ -221,23 +214,8 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  _cairoGraphics->DrawRoundedRectangle(cr,
-                                       1.0f,
-                                       0.5f,
-                                       0.5f,
-                                       ITEM_CORNER_RADIUS_ABS,
-                                       width - 1.0f,
-                                       height - 1.0f);
-  cairo_fill(cr);
-
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
-
-  DrawText(cr, width, height, transparent);
+  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
+  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
 
   if (_prelightTexture[0])
     _prelightTexture[0]->UnReference();
@@ -248,26 +226,14 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-  cairo_scale(cr, 1.0f, 1.0f);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_set_line_width(cr, 1.0f);
-
-  _cairoGraphics->DrawRoundedRectangle(cr,
-                                       1.0f,
-                                       0.5f,
-                                       0.5f,
-                                       ITEM_CORNER_RADIUS_ABS,
-                                       width - 1.0f,
-                                       height - 1.0f);
-  cairo_fill(cr);
+  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
 
   cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
 
   cairo_arc(cr, x, y, radius, 0.0f * (G_PI / 180.0f), 360.0f * (G_PI / 180.0f));
   cairo_fill(cr);
 
-  DrawText(cr, width, height, transparent);
+  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
 
   if (_prelightTexture[1])
     _prelightTexture[1]->UnReference();
@@ -275,6 +241,7 @@
   _prelightTexture[1] = texture_from_cairo_graphics(*_cairoGraphics);
 
   // finally clean up
+  cairo_destroy(cr);
   delete _cairoGraphics;
 }
 

=== modified file 'plugins/unityshell/src/QuicklistMenuItemSeparator.cpp'
--- plugins/unityshell/src/QuicklistMenuItemSeparator.cpp	2011-12-14 21:12:28 +0000
+++ plugins/unityshell/src/QuicklistMenuItemSeparator.cpp	2012-01-03 21:46:26 +0000
@@ -30,9 +30,9 @@
                     NUX_FILE_LINE_PARAM)
 {
   _name = "QuicklistMenuItemSeparator";
-  SetMinimumHeight(5);
-  SetBaseSize(64, 5);
-  //_normalTexture = NULL;
+  SetMinimumHeight(3);
+  SetBaseSize(64, 3);
+
   _color      = nux::Color(1.0f, 1.0f, 1.0f, 0.5f);
   _premultiplied_color = nux::Color(0.5f, 0.5f, 0.5f, 0.5f);
   _item_type  = MENUITEM_TYPE_SEPARATOR;
@@ -145,10 +145,9 @@
 QuicklistMenuItemSeparator::UpdateTexture()
 {
   int width  = GetBaseWidth();
+  int height  = GetBaseHeight();
 
-  _cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32,
-                                          GetBaseWidth(),
-                                          GetBaseHeight());
+  _cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
   cairo_t* cr = _cairoGraphics->GetContext();
 
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
@@ -156,8 +155,8 @@
   cairo_paint(cr);
   cairo_set_source_rgba(cr, _color.red, _color.green, _color.blue, _color.alpha);
   cairo_set_line_width(cr, 1.0f);
-  cairo_move_to(cr, 0.5f, 2.5f);
-  cairo_line_to(cr, width - 0.5f, 2.5f);
+  cairo_move_to(cr, ITEM_PADDING + 0.5f, height/2.0f);
+  cairo_line_to(cr, width - ITEM_PADDING - 0.5f, height/2.0f);
   cairo_stroke(cr);
 
   if (_normalTexture[0])
@@ -165,6 +164,7 @@
 
   _normalTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
 
+  cairo_destroy(cr);
   delete _cairoGraphics;
 }
 

=== modified file 'plugins/unityshell/src/QuicklistView.cpp'
--- plugins/unityshell/src/QuicklistView.cpp	2011-12-19 20:20:22 +0000
+++ plugins/unityshell/src/QuicklistView.cpp	2012-01-03 21:46:26 +0000
@@ -69,8 +69,8 @@
   , _corner_radius(4)
   , _padding(13)
   , _left_padding_correction(-1)
-  , _bottom_padding_correction_normal(-2)
-  , _bottom_padding_correction_single_item(-4)
+  , _bottom_padding_correction_normal(-1)
+  , _bottom_padding_correction_single_item(-2)
   , _offset_correction(-1)
   , _cairo_text_has_changed(true)
   , _compute_blur_bkg(true)
@@ -80,22 +80,20 @@
 
   _left_space = new nux::SpaceLayout(_padding +
                                      _anchor_width +
-                                     _corner_radius +
                                      _left_padding_correction,
                                      _padding +
                                      _anchor_width +
-                                     _corner_radius +
                                      _left_padding_correction,
                                      1, 1000);
-  _right_space = new nux::SpaceLayout(_padding + _corner_radius,
-                                      _padding + _corner_radius,
+  _right_space = new nux::SpaceLayout(_padding,
+                                      _padding,
                                       1, 1000);
   _top_space = new nux::SpaceLayout(1, 1000,
-                                    _padding + _corner_radius,
-                                    _padding + _corner_radius);
+                                    _padding,
+                                    _padding);
   _bottom_space = new nux::SpaceLayout(1, 1000,
-                                       _padding + _corner_radius,
-                                       _padding + _corner_radius);
+                                       _padding,
+                                       _padding);
 
   _vlayout = new nux::VLayout(TEXT(""), NUX_TRACKER_LOCATION);
   _vlayout->AddLayout(_top_space, 0);
@@ -542,16 +540,15 @@
 
   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 minimum_height = (_anchor_height - TotalItemHeight) / 2 + 1 + _padding;
+    _top_space->SetMinimumHeight(minimum_height);
+    _bottom_space->SetMinimumHeight(minimum_height + _bottom_padding_correction_single_item);
   }
   else
   {
-    _top_space->SetMinMaxSize(_padding + _corner_radius, _padding + _corner_radius);
-    _bottom_space->SetMinMaxSize(_padding + _corner_radius - 2,
-                                 _padding + _corner_radius +
+    _top_space->SetMinimumHeight(_padding);
+    _bottom_space->SetMinMaxSize(_padding - 2,
+                                 _padding +
                                  _bottom_padding_correction_normal);
   }
 
@@ -567,8 +564,8 @@
 
   UpdateTexture();
 
-  int x = _padding + _anchor_width + _corner_radius + _offset_correction;
-  int y = _padding + _corner_radius + _offset_correction;
+  int x = _padding + _anchor_width + _offset_correction;
+  int y = _padding + _offset_correction;
 
   std::list<QuicklistMenuItem*>::iterator it;
   for (it = _item_list.begin(); it != _item_list.end(); it++)