Merge lp:~didrocks/unity/fix-705697-705803 into lp:unity

[Didier Roche-Tolomelli]

This branch with two bugs introduced when the padding was made variable
(3 pixels instead of 6) in the indicator:
- extra blank space between some indicator groups (which are unclickeable)
- the session indicator isn't in the top right corner

Furthemore, we ensure that the session indicator will still be in the top right
corner even if we mess again with size.

[Neil J. Patel (njpatel)]

looks good. approved.

review: Approve

=== modified file 'src/PanelIndicatorObjectEntryView.h'
--- src/PanelIndicatorObjectEntryView.h	2011-01-20 12:48:09 +0000
+++ src/PanelIndicatorObjectEntryView.h	2011-01-25 15:49:09 +0000
@@ -30,7 +30,6 @@
 #include "Introspectable.h"
 
 #define PANEL_HEIGHT 24
-//#define PADDING 6
 #define SPACING 3
 
 class PanelIndicatorObjectEntryView : public nux::TextureArea, public Introspectable
 
=== modified file 'src/PanelIndicatorObjectView.cpp'
--- src/PanelIndicatorObjectView.cpp	2010-12-17 14:07:11 +0000
+++ src/PanelIndicatorObjectView.cpp	2011-01-25 15:49:09 +0000
@@ -43,10 +43,14 @@
   _proxy (proxy),
   _entries ()
 {
-  printf ("IndicatorAdded: %s\n", _proxy->GetName ().c_str ());
+  g_debug ("IndicatorAdded: %s", _proxy->GetName ().c_str ());
   _layout = new nux::HLayout ("", NUX_TRACKER_LOCATION);
 
   SetCompositionLayout (_layout);
+  
+  // default in Nux is 32, we have some PanelIndicatorObjectEntryView which are smaller than that.
+  // so redefining the minimum value for them.
+  SetMinimumWidth (MINIMUM_INDICATOR_WIDTH);
  
   _proxy->OnEntryAdded.connect (sigc::mem_fun (this, &PanelIndicatorObjectView::OnEntryAdded));
   _proxy->OnEntryMoved.connect (sigc::mem_fun (this, &PanelIndicatorObjectView::OnEntryMoved));
@@ -84,7 +88,7 @@
 {
   PanelIndicatorObjectEntryView *view = new PanelIndicatorObjectEntryView (proxy);
   _layout->AddView (view, 0, nux::eCenter, nux::eFull);
-  _layout->SetContentDistribution (nux::eStackLeft);
+  _layout->SetContentDistribution (nux::eStackRight);
 
   _entries.push_back (view);
 
 
=== modified file 'src/PanelIndicatorObjectView.h'
--- src/PanelIndicatorObjectView.h	2010-12-17 14:07:11 +0000
+++ src/PanelIndicatorObjectView.h	2011-01-25 15:49:09 +0000
@@ -27,6 +27,8 @@
 
 #include "Introspectable.h"
 
+#define MINIMUM_INDICATOR_WIDTH 12
+
 class PanelIndicatorObjectView : public nux::View, public Introspectable
 {
 public:
 
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-01-20 13:45:55 +0000
+++ src/PanelMenuView.cpp	2011-01-25 15:49:09 +0000
@@ -117,7 +117,6 @@
 PanelMenuView::SetProxy (IndicatorObjectProxy *proxy)
 {
   _proxy = proxy;
-  printf ("IndicatorAdded: %s\n", _proxy->GetName ().c_str ());
 
   _proxy->OnEntryAdded.connect (sigc::mem_fun (this, &PanelMenuView::OnEntryAdded));
   _proxy->OnEntryMoved.connect (sigc::mem_fun (this, &PanelMenuView::OnEntryMoved));