Merge lp:~robertcarr/unity/filtertweaks

(bzr r1693.2.2)

5 files changed, 15 insertions, 5 deletions

diff --git a/plugins/unityshell/resources/dash-widgets.json b/plugins/unityshell/resources/dash-widgets.json
index 98e034f15..657dd7dd9 100644
--- a/plugins/unityshell/resources/dash-widgets.json
+++ b/plugins/unityshell/resources/dash-widgets.json
@@ -47,7 +47,7 @@
 "text-color" : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],
 "text-opacity" : [ 1.0, 1.0, 1.0, 1.0, 1.0], 
 "fill-color" : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],
- "fill-opacity" : [ 0.5, 0.0, 0.25, 0.0, 0.0],
+ "fill-opacity" : [ 0.25, 0.0, 0.25, 0.0, 0.0],
 "overlay-opacity": [ 0.1, 0.1, 0.1, 0.0, 0.0],
 "overlay-mode" : [ "normal", "normal", "normal", "normal", "normal"],
 "blur-size" : [ 1, 1, 1, 0, 0]},
diff --git a/plugins/unityshell/src/FilterBar.cpp b/plugins/unityshell/src/FilterBar.cpp
index 300396bb9..c629fdb9c 100644
--- a/plugins/unityshell/src/FilterBar.cpp
+++ b/plugins/unityshell/src/FilterBar.cpp
@@ -46,6 +46,7 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterBar);
 void FilterBar::Init () {
 nux::Layout *layout = new nux::VLayout (NUX_TRACKER_LOCATION);
 layout->SetVerticalInternalMargin(12);
+ layout->SetVerticalExternalMargin(0);
 SetLayout (layout);
 }
 
diff --git a/plugins/unityshell/src/FilterExpanderLabel.cpp b/plugins/unityshell/src/FilterExpanderLabel.cpp
index da726e900..513fc2c37 100644
--- a/plugins/unityshell/src/FilterExpanderLabel.cpp
+++ b/plugins/unityshell/src/FilterExpanderLabel.cpp
@@ -26,6 +26,7 @@
 
 #include "FilterBasicButton.h"
 #include "FilterExpanderLabel.h"
+#include "PlacesStyle.h"
 
 namespace unity {
 
@@ -56,6 +57,8 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel);
 
 void FilterExpanderLabel::SetRightHandView (nux::View *view)
 {
+ view->SetMaximumHeight(30);
+
 right_hand_contents_ = view;
 top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
 }
@@ -71,9 +74,11 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel);
 
 void FilterExpanderLabel::BuildLayout ()
 {
+ PlacesStyle *style = PlacesStyle::GetDefault(); 
+
 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
 top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-
+ 
 cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
 cairo_label_->SetFontName("Ubuntu 10");
 cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
@@ -88,9 +93,11 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel);
 
 top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
 top_bar_layout_->AddSpace(1, 1);
+ 
+ top_bar_layout_->SetMaximumWidth((style->GetTileWidth() -12)*2+10);
 
- layout_->AddLayout (top_bar_layout_, 0);
- layout_->SetVerticalInternalMargin(12);
+ layout_->AddLayout (top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
+ layout_->SetVerticalInternalMargin(0);
 
 SetLayout(layout_);
 
diff --git a/plugins/unityshell/src/FilterGenreWidget.cpp b/plugins/unityshell/src/FilterGenreWidget.cpp
index 72c9e3ee3..84c5b2666 100644
--- a/plugins/unityshell/src/FilterGenreWidget.cpp
+++ b/plugins/unityshell/src/FilterGenreWidget.cpp
@@ -61,7 +61,7 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterGenre);
 genre_layout_->SetVerticalExternalMargin (12);
 genre_layout_->SetHorizontalInternalMargin (10);
 genre_layout_->EnablePartialVisibility (false);
- genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 35);
+ genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 32);
 
 SetRightHandView(all_button_);
 SetContents(genre_layout_);
diff --git a/plugins/unityshell/src/LensView.cpp b/plugins/unityshell/src/LensView.cpp
index 5e47756ad..9fb805656 100644
--- a/plugins/unityshell/src/LensView.cpp
+++ b/plugins/unityshell/src/LensView.cpp
@@ -144,6 +144,8 @@ LensView::~LensView()
 void LensView::SetupViews()
 {
 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+ 
+ layout_->SetHorizontalExternalMargin(8);
 
 scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
 NUX_TRACKER_LOCATION);