Merge lp:~3v1n0/unity/spread-filter-improvements into lp:unity

[Marco Trevisan (Treviño)]

SpreadFilter: use launcher width, scale on HiDPI, match also application names

Launcher Width is now considered in setting the offset of the scale filter (fixes
padding when launcher is in autohide mode).
The search bar is correctly scaled when in HiDPI mode.
We use ApplicationManager and thus BAMF to match windows by their name or app name.

Launcher Width is now considered in setting the offset of the scale filter (fixes padding when launcher is in autohide mode)

The search bar is correctly scaled when in HiDPI mode

We use ApplicationManager and thus BAMF to match windows by their name or app name.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3753
http://jenkins.qa.ubuntu.com/job/unity-ci/841/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/373
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/375

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/841/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3755
http://jenkins.qa.ubuntu.com/job/unity-ci/842/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/378
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/374/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/376

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/842/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-21 23:08:47 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-01 17:13:46 +0000
@@ -525,8 +525,13 @@
     }
     else
     {
+      CompMatch windows_match;
+      for (auto xid : spread_filter_->FilteredWindows())
+        windows_match |= "xid="+std::to_string(xid);
+
       auto match = sScreen->getCustomMatch();
-      sScreen->relayoutSlots(match & ("ititle="+filter));
+      match &= windows_match;
+      sScreen->relayoutSlots(match);
     }
   });
 

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2014-03-20 04:05:39 +0000
+++ unity-shared/SearchBar.cpp	2014-04-01 17:13:46 +0000
@@ -332,7 +332,9 @@
 void SearchBar::UpdateScale(double scale)
 {
   hint_->SetScale(scale);
-  show_filters_->SetScale(scale);
+
+  if (show_filters_)
+    show_filters_->SetScale(scale);
 
   UpdateSearchBarSize();
 }

=== modified file 'unity-shared/SpreadFilter.cpp'
--- unity-shared/SpreadFilter.cpp	2014-02-17 23:30:29 +0000
+++ unity-shared/SpreadFilter.cpp	2014-04-01 17:13:46 +0000
@@ -22,7 +22,10 @@
 #include <Nux/HLayout.h>
 #include "AnimationUtils.h"
 #include "SearchBar.h"
+#include "UnitySettings.h"
 #include "WindowManager.h"
+#include "ApplicationManager.h"
+#include "RawPixel.h"
 
 namespace unity
 {
@@ -32,15 +35,31 @@
 {
 const unsigned FADE_DURATION = 100;
 const unsigned DEFAULT_SEARCH_WAIT = 300;
-const nux::Point OFFSET(10, 15);
-const nux::Size SIZE(620, 42);
+const RawPixel OFFSET_X = 10_em;
+const RawPixel OFFSET_Y = 15_em;
+const RawPixel WIDTH = 620_em;
+const RawPixel HEIGHT = 42_em;
+
+// For some reason std::to_lower or boost::to_lower_copy doesn't seem to handle well utf8
+std::string casefold_copy(std::string const& str)
+{
+  return glib::String(g_utf8_casefold(str.c_str(), -1)).Str();
+}
 }
 
 Filter::Filter()
   : fade_animator_(FADE_DURATION)
 {
+  auto& wm = WindowManager::Default();
+  auto& settings = Settings::Instance();
+  auto const& work_area = wm.GetWorkAreaGeometry(0);
+  int monitor = wm.MonitorGeometryIn(work_area);
+  int launcher_width = settings.LauncherWidth(monitor);
+  auto const& cv = settings.em(monitor);
+
   search_bar_ = SearchBar::Ptr(new SearchBar());
-  search_bar_->SetMinMaxSize(SIZE.width, SIZE.height);
+  search_bar_->SetMinMaxSize(WIDTH.CP(cv), HEIGHT.CP(cv));
+  search_bar_->scale = cv->DPIScale();
   search_bar_->live_search_wait = DEFAULT_SEARCH_WAIT;
   text.SetGetterFunction([this] { return search_bar_->search_string(); });
   text.SetSetterFunction([this] (std::string const& t) { search_bar_->search_string = t; return false; });
@@ -51,7 +70,6 @@
   layout->SetHorizontalExternalMargin(0);
   layout->AddView(search_bar_.GetPointer());
 
-  auto const& work_area = WindowManager::Default().GetWorkAreaGeometry(0);
   view_window_ = new nux::BaseWindow(GetName().c_str());
   view_window_->SetLayout(layout);
   view_window_->SetBackgroundColor(nux::color::Transparent);
@@ -61,7 +79,7 @@
   view_window_->SetOpacity(0.0f);
   view_window_->SetEnterFocusInputArea(search_bar_.GetPointer());
   view_window_->SetInputFocus();
-  view_window_->SetXY(OFFSET.x + work_area.x, OFFSET.y + work_area.y);
+  view_window_->SetXY(OFFSET_X.CP(cv) + std::max(work_area.x, launcher_width), OFFSET_Y.CP(cv) + work_area.y);
   fade_animator_.updated.connect([this] (double opacity) { view_window_->SetOpacity(opacity); });
 
   nux::GetWindowCompositor().SetKeyFocusArea(search_bar_->text_entry());
@@ -72,6 +90,7 @@
 
     if (search.empty())
     {
+      UpdateFilteredWindows();
       text.changed.emit(search);
       animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
     }
@@ -80,6 +99,7 @@
   search_bar_->live_search_reached.connect([this] (std::string const& search) {
     if (!search.empty())
     {
+      UpdateFilteredWindows();
       text.changed.emit(search);
       search_bar_->SetSearchFinished();
     }
@@ -102,6 +122,37 @@
   return view_window_->GetGeometry();
 }
 
+std::set<uint64_t> const& Filter::FilteredWindows() const
+{
+  return filtered_windows_;
+}
+
+void Filter::UpdateFilteredWindows()
+{
+  auto const& lower_search = casefold_copy(text());
+  filtered_windows_.clear();
+
+  if (lower_search.empty())
+    return;
+
+  for (auto const& app : ApplicationManager::Default().GetRunningApplications())
+  {
+    if (casefold_copy(app->title()).find(lower_search) != std::string::npos)
+    {
+      for (auto const& win : app->GetWindows())
+        filtered_windows_.insert(win->window_id());
+
+      continue;
+    }
+
+    for (auto const& win : app->GetWindows())
+    {
+      if (casefold_copy(win->title()).find(lower_search) != std::string::npos)
+        filtered_windows_.insert(win->window_id());
+    }
+  }
+}
+
 //
 // Introspection
 //

=== modified file 'unity-shared/SpreadFilter.h'
--- unity-shared/SpreadFilter.h	2014-02-17 04:01:26 +0000
+++ unity-shared/SpreadFilter.h	2014-04-01 17:13:46 +0000
@@ -47,15 +47,20 @@
   bool Visible() const;
   nux::Geometry const& GetAbsoluteGeometry() const;
 
+  std::set<uint64_t> const& FilteredWindows() const;
+
 protected:
   // Introspectable
   std::string GetName() const;
   void AddProperties(debug::IntrospectionData&);
 
 private:
+  void UpdateFilteredWindows();
+
   nux::ObjectPtr<SearchBar> search_bar_;
   nux::ObjectPtr<nux::BaseWindow> view_window_;
   nux::animation::AnimateValue<double> fade_animator_;
+  std::set<uint64_t> filtered_windows_;
 };
 
 } // namespace spread