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

[Mirco Müller]

Use a padding of 6px for the appmenu and 3px for the other indicators. Fixes LP: #684114

[Neil J. Patel (njpatel)]

Sweet!

review: Approve

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2011-01-13 15:54:59 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2011-01-20 13:07:37 +0000
@@ -36,13 +36,14 @@
 static void draw_menu_bg (cairo_t *cr, int width, int height);
 
 
-PanelIndicatorObjectEntryView::PanelIndicatorObjectEntryView (IndicatorObjectEntryProxy *proxy)
+PanelIndicatorObjectEntryView::PanelIndicatorObjectEntryView (IndicatorObjectEntryProxy *proxy, int padding)
 : TextureArea (NUX_TRACKER_LOCATION),
   _proxy (proxy),
   _util_cg (CAIRO_FORMAT_ARGB32, 1, 1)
 {
   _proxy->active_changed.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnActiveChanged));
   _proxy->updated.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::Refresh));
+  _padding = padding;
 
   InputArea::OnMouseDown.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseDown));
   InputArea::OnMouseWheel.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseWheel));
@@ -185,7 +186,7 @@
   }
 
   if (width)
-    width += PADDING *2;
+    width += _padding *2;
 
   SetMinimumWidth (width);
 
@@ -196,7 +197,7 @@
   if (_proxy->GetActive ())
     draw_menu_bg (cr, width, height);
 
-  x = PADDING;
+  x = _padding;
   y = 0;
 
   if (_proxy->GetPixbuf () && _proxy->icon_visible)
 
=== modified file 'src/PanelIndicatorObjectEntryView.h'
--- src/PanelIndicatorObjectEntryView.h	2011-01-13 15:54:59 +0000
+++ src/PanelIndicatorObjectEntryView.h	2011-01-20 13:07:37 +0000
@@ -30,13 +30,13 @@
 #include "Introspectable.h"
 
 #define PANEL_HEIGHT 24
-#define PADDING 6
+//#define PADDING 6
 #define SPACING 3
 
 class PanelIndicatorObjectEntryView : public nux::TextureArea, public Introspectable
 {
 public:
-  PanelIndicatorObjectEntryView (IndicatorObjectEntryProxy *proxy);
+  PanelIndicatorObjectEntryView (IndicatorObjectEntryProxy *proxy, int padding = 3);
   ~PanelIndicatorObjectEntryView ();
 
   void Refresh ();
@@ -55,6 +55,7 @@
   IndicatorObjectEntryProxy *_proxy;
 private:
   nux::CairoGraphics _util_cg;
+  int _padding;
 };
 
 #endif // PANEL_INDICATOR_OBJECT_ENTRY_VIEW_H
 
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-01-14 18:17:34 +0000
+++ src/PanelMenuView.cpp	2011-01-20 13:07:37 +0000
@@ -44,7 +44,7 @@
                                       PanelMenuView *self);
 
 
-PanelMenuView::PanelMenuView ()
+PanelMenuView::PanelMenuView (int padding)
 : _matcher (NULL),
   _title_layer (NULL),
   _util_cg (CAIRO_FORMAT_ARGB32, 1, 1),
@@ -67,6 +67,8 @@
    */
   _layout = _menu_layout;
 
+  _padding = padding;
+
   _window_buttons = new WindowButtons ();
   _window_buttons->NeedRedraw ();
   _window_buttons->close_clicked.connect (sigc::mem_fun (this, &PanelMenuView::OnCloseClicked));
@@ -168,14 +170,14 @@
   nux::Geometry geo = GetGeometry ();
 
   old_window_buttons_w = _window_buttons->GetContentWidth ();
-  _window_buttons->SetGeometry (geo.x + PADDING, geo.y, old_window_buttons_w, geo.height);
+  _window_buttons->SetGeometry (geo.x + _padding, geo.y, old_window_buttons_w, geo.height);
   _window_buttons->ComputeLayout2 ();
   new_window_buttons_w = _window_buttons->GetContentWidth ();
 
   
   /* Explicitly set the size and position of the widgets */
-  geo.x += PADDING + new_window_buttons_w + PADDING;
-  geo.width -= PADDING + new_window_buttons_w + PADDING;
+  geo.x += _padding + new_window_buttons_w + _padding;
+  geo.width -= _padding + new_window_buttons_w + _padding;
 
   old_menu_area_w = _menu_layout->GetContentWidth ();
   _menu_layout->SetGeometry (geo.x, geo.y, old_menu_area_w, geo.height);
@@ -196,7 +198,7 @@
 PanelMenuView::Draw (nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   nux::Geometry geo = GetGeometry ();
-  int button_width = PADDING + _window_buttons->GetContentWidth () + PADDING;
+  int button_width = _padding + _window_buttons->GetContentWidth () + _padding;
   float factor = 4;
   button_width /= factor;
     
@@ -430,11 +432,11 @@
   cr = cairo_graphics.GetContext();
   cairo_set_line_width (cr, 1);
 
-  x = PADDING;
+  x = _padding;
   y = 0;
 
   if (_is_maximized)
-    x += _window_buttons->GetContentWidth () + PADDING + PADDING;
+    x += _window_buttons->GetContentWidth () + _padding + _padding;
 
   if (label)
   {
@@ -518,7 +520,7 @@
 void
 PanelMenuView::OnEntryAdded (IndicatorObjectEntryProxy *proxy)
 {
-  PanelIndicatorObjectEntryView *view = new PanelIndicatorObjectEntryView (proxy);
+  PanelIndicatorObjectEntryView *view = new PanelIndicatorObjectEntryView (proxy, 6);
   view->active_changed.connect (sigc::mem_fun (this, &PanelMenuView::OnActiveChanged));
   view->refreshed.connect (sigc::mem_fun (this, &PanelMenuView::OnEntryRefreshed));
   _menu_layout->AddView (view, 0, nux::eCenter, nux::eFull);
 
=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2010-12-30 15:57:11 +0000
+++ src/PanelMenuView.h	2011-01-20 13:07:37 +0000
@@ -47,7 +47,7 @@
   // It also deals with undecorating maximized windows (and redecorating them
   // on unmaximize)
 
-  PanelMenuView ();
+  PanelMenuView (int padding = 6);
   ~PanelMenuView ();
 
   void FullRedraw ();
@@ -110,5 +110,6 @@
   PanelTitlebarGrabArea * _panel_titlebar_grab_area;
 
   std::map<guint32, bool> _decor_map;
+  int _padding;
 };
 #endif