Merge lp:~macslow/unity/unity.fix-863240 into lp:unity

[Mirco Müller]

Fixes the position, alignment, spacing and arrow-artwork for the "Filter results". See...

http://people.canonical.com/~mmueller/fix-863240.png

[Andrea Cimitan (cimi)]

The arrow should be moved few pixels below... At least comparing your screenshot with https://launchpadlibrarian.net/81538790/file_lens_filters.png

review: Needs Fixing

[Mirco Müller (macslow)]

> The arrow should be moved few pixels below... At least comparing your
> screenshot with https://launchpadlibrarian.net/81538790/file_lens_filters.png

That's not possible with nux' layout right now.

[Andrea Cimitan (cimi)]

So we can merge it, but keep the bug opened (In progress) until it is fixed. Or we need workarounds... but we can't deliver all those imperfections in 12.04

[Mirco Müller (macslow)]

> So we can merge it, but keep the bug opened (In progress) until it is fixed.
> Or we need workarounds... but we can't deliver all those imperfections in
> 12.04

I fixed the position with an insane nested nux-layout solution just for the arrow... and got Jay to agree on my request for extending nux' layout API with an pixel-offset ability. But that's something which will not happen right away. So we can just use my current work-around for the position-fix.

[Andrea Cimitan (cimi)]

I am fine with the visual changes then, you should do the same for the "see more lines..." issue as well (definitely!!!).
On the code side, waiting for a unity dev. What I can say is that you should add a small comment like FIXME just to remember *why* you did that and when you plan to remove that code (so when Nux will feature what we want).

And you added one blank line in the last header file, not sure if that's wanted!

Cheers, thx!

[Andrea Cimitan (cimi)]

review: Abstain

[Andrea Cimitan (cimi)]

tested, it is close to the right edge here... doesn-t look like in your screenshot

[Gord Allott (gordallott)]

review: Approve

=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2012-01-16 15:19:01 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2012-01-17 15:01:26 +0000
@@ -22,6 +22,7 @@
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 #include <Nux/HLayout.h>
+#include <Nux/VLayout.h>
 #include <Nux/Layout.h>
 #include <Nux/WindowCompositor.h>
 
@@ -44,6 +45,8 @@
 #define LIVE_SEARCH_TIMEOUT 40
 #define SPINNER_TIMEOUT 100
 
+static const float kExpandDefaultIconOpacity = 1.0f;
+
 namespace unity
 {
 namespace dash
@@ -94,23 +97,42 @@
   layered_layout_->SetActiveLayerN(1);
   layered_layout_->SetMinimumWidth(search_bar_width_);
   layered_layout_->SetMaximumWidth(search_bar_width_);
-  layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  layout_->AddView(layered_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
-  std::string filter_str = _("Filter results");
-  filter_str+= "  ▸";
+  std::string filter_str = _("<b>Filter results</b>");
   show_filters_ = new nux::StaticCairoText(filter_str.c_str());
   show_filters_->SetVisible(false);
   show_filters_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
   show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
   show_filters_->mouse_click.connect([&] (int x, int y, unsigned long b, unsigned long k) { showing_filters = !showing_filters; });
 
+  nux::BaseTexture* arrow;
+  arrow = dash::Style::Instance().GetGroupExpandIcon();
+  expand_icon_ = new IconTexture(arrow,
+                                 arrow->GetWidth(),
+                                 arrow->GetHeight());
+  expand_icon_->SetOpacity(kExpandDefaultIconOpacity);
+  expand_icon_->SetMinimumSize(arrow->GetWidth(), arrow->GetHeight());
+  expand_icon_->SetVisible(false);
+  expand_icon_->mouse_click.connect([&] (int x, int y, unsigned long b, unsigned long k) { showing_filters = !showing_filters; });
+
   filter_layout_ = new nux::HLayout();
-  filter_layout_->SetHorizontalExternalMargin(12);
-  filter_space_ = new nux::SpaceLayout(0, 10000, 0, 1);
+  filter_layout_->SetHorizontalInternalMargin(8);
+  filter_layout_->SetHorizontalExternalMargin(6);
+  filter_space_ = new nux::SpaceLayout(100, 10000, 0, 1);
   filter_layout_->AddLayout(filter_space_, 1);
-  filter_layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_RIGHT);
-
-  layout_->AddView(filter_layout_, 0, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FIX);
+  filter_layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_CENTER);
+
+  arrow_layout_  = new nux::VLayout();
+  arrow_top_space_ = new nux::SpaceLayout(2, 2, 12, 12);
+  arrow_bottom_space_ = new nux::SpaceLayout(2, 2, 8, 8);
+  arrow_layout_->AddView(arrow_top_space_, 0, nux::MINOR_POSITION_CENTER);
+  arrow_layout_->AddView(expand_icon_, 0, nux::MINOR_POSITION_CENTER);
+  arrow_layout_->AddView(arrow_bottom_space_, 0, nux::MINOR_POSITION_CENTER);
+
+  filter_layout_->AddView(arrow_layout_, 0, nux::MINOR_POSITION_CENTER);
+
+  layout_->AddView(filter_layout_, 1, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FULL);
 
   sig_manager_.Add(new Signal<void, GtkSettings*, GParamSpec*>
       (gtk_settings_get_default(),
@@ -123,7 +145,11 @@
   search_string.SetSetterFunction(sigc::mem_fun(this, &SearchBar::set_search_string));
   im_active.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_im_active));
   showing_filters.changed.connect(sigc::mem_fun(this, &SearchBar::OnShowingFiltersChanged));
-  can_refine_search.changed.connect([&] (bool can_refine) { show_filters_->SetVisible(can_refine); });
+  can_refine_search.changed.connect([&] (bool can_refine)
+  {
+    show_filters_->SetVisible(can_refine);
+    expand_icon_->SetVisible(can_refine);
+  });
 }
 
 SearchBar::~SearchBar()
@@ -229,11 +255,11 @@
 
 void SearchBar::OnShowingFiltersChanged(bool is_showing)
 {
-  std::string filter_str = _("Filter results");
-  filter_str += "  <small>";
-  filter_str += is_showing ? "▾" : "▸";
-  filter_str += "</small>";
-  show_filters_->SetText(filter_str.c_str());
+  dash::Style& style = dash::Style::Instance();
+  if (is_showing)
+    expand_icon_->SetTexture(style.GetGroupUnexpandIcon());
+  else
+    expand_icon_->SetTexture(style.GetGroupExpandIcon());
 }
 
 void SearchBar::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)

=== modified file 'plugins/unityshell/src/DashSearchBar.h'
--- plugins/unityshell/src/DashSearchBar.h	2012-01-16 15:19:01 +0000
+++ plugins/unityshell/src/DashSearchBar.h	2012-01-17 15:01:26 +0000
@@ -33,6 +33,7 @@
 #include <UnityCore/GLibSignal.h>
 
 #include "DashSearchBarSpinner.h"
+#include "IconTexture.h"
 #include "IMTextEntry.h"
 #include "Introspectable.h"
 #include "StaticCairoText.h"
@@ -103,8 +104,13 @@
   nux::HLayout* filter_layout_;
   nux::SpaceLayout* filter_space_;
   nux::StaticCairoText* show_filters_;
+  nux::VLayout* arrow_layout_;
+  nux::SpaceLayout* arrow_top_space_;
+  nux::SpaceLayout* arrow_bottom_space_;
+  IconTexture* expand_icon_;
   int search_bar_width_;
 
+
   int last_width_;
   int last_height_;