Merge lp:~3v1n0/unity/dynamic-app-spread into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: if a new window opens while spreading, spread again with proper match

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4041
http://jenkins.qa.ubuntu.com/job/unity-ci/1354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/6

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4041
http://jenkins.qa.ubuntu.com/job/unity-ci/1354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/6

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4041
http://jenkins.qa.ubuntu.com/job/unity-ci/1356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/8

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4041
http://jenkins.qa.ubuntu.com/job/unity-ci/1357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/9

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2015-10-27 19:21:27 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2015-11-18 16:34:03 +0000
@@ -157,6 +157,9 @@
   signals_conn_.Add(app_->window_opened.connect([this](ApplicationWindowPtr const& win) {
     signals_conn_.Add(win->monitor.changed.connect([this] (int) { EnsureWindowsLocation(); }));
     EnsureWindowsLocation();
+
+    if (WindowManager::Default().IsScaleActiveForGroup() && IsActive())
+      Spread(true, 0, false);
   }));
 
   auto ensure_win_location_cb = sigc::hide(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowsLocation));
@@ -291,12 +294,7 @@
     return;
   }
 
-  bool scaleWasActive = wm.IsScaleActive();
-  if (scaleWasActive)
-  {
-    wm.TerminateScale();
-  }
-
+  bool scale_was_active = wm.IsScaleActive();
   bool active = IsActive();
   bool user_visible = IsRunning();
   /* We should check each child to see if there is
@@ -389,6 +387,7 @@
     if (GetQuirk(Quirk::STARTING, arg.monitor))
       return;
 
+    wm.TerminateScale();
     SetQuirk(Quirk::STARTING, true, arg.monitor);
     OpenInstanceLauncherIcon(arg.timestamp);
   }
@@ -396,8 +395,10 @@
   {
     if (active)
     {
-      if (scaleWasActive) // #5 above
+      if (scale_was_active) // #5 above
       {
+        wm.TerminateScale();
+
         if (minimize_window_on_click())
         {
           for (auto const& win : GetWindows(WindowFilter::ON_CURRENT_DESKTOP))
@@ -414,7 +415,7 @@
         {
           bool minimized = false;
 
-          if (minimize_window_on_click)
+          if (minimize_window_on_click())
           {
             WindowList const& windows = GetWindows(WindowFilter::ON_CURRENT_DESKTOP);
 
@@ -434,9 +435,13 @@
     }
     else
     {
-      if (scaleWasActive) // #4 above
+      if (scale_was_active) // #4 above
       {
+        if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() <= 1)
+          wm.TerminateScale();
+
         Focus(arg);
+
         if (arg.source != ActionArg::Source::SWITCHER)
           Spread(true, 0, false);
       }
@@ -704,9 +709,8 @@
 {
   std::vector<Window> windows;
   for (auto& window : GetWindows(current_desktop ? WindowFilter::ON_CURRENT_DESKTOP : 0))
-  {
     windows.push_back(window->window_id());
-  }
+
   return WindowManager::Default().ScaleWindowGroup(windows, state, force);
 }
 
@@ -1171,7 +1175,10 @@
   auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
 
   _source_manager.AddTimeout(1000, [this, timestamp] {
-    WindowManager::Default().TerminateScale();
+    bool to_spread = GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1;
+
+    if (!to_spread)
+      WindowManager::Default().TerminateScale();
 
     if (!IsRunning())
       return false;
@@ -1179,7 +1186,7 @@
     UBusManager::SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
     Focus(ActionArg(ActionArg::Source::LAUNCHER, 1, timestamp));
 
-    if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1)
+    if (to_spread)
       Spread(true, COMPIZ_SCALE_DND_SPREAD, false);
 
     return false;
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2015-10-21 14:28:00 +0000
+++ unity-shared/PluginAdapter.cpp	2015-11-18 16:34:03 +0000
@@ -72,8 +72,10 @@
 PluginAdapter::PluginAdapter(CompScreen* screen)
   : bias_active_to_viewport(false)
   , m_Screen(screen)
+  , _scale_screen(ScaleScreen::get(screen))
   , _coverage_area_before_automaximize(0.75)
   , _spread_state(false)
+  , _spread_requested_state(false)
   , _spread_windows_state(false)
   , _expo_state(false)
   , _vp_switch_started(false)
@@ -95,6 +97,7 @@
   if (!_spread_state && screen->grabExist("scale"))
   {
     _spread_state = true;
+    _spread_requested_state = true;
     initiate_spread.emit();
   }
 
@@ -110,6 +113,7 @@
   if (_spread_state && !screen->grabExist("scale"))
   {
     _spread_state = false;
+    _spread_requested_state = false;
     _spread_windows_state = false;
     terminate_spread.emit();
   }
@@ -216,6 +220,7 @@
     if (_spread_state != new_state)
     {
       _spread_state = new_state;
+      _spread_requested_state = new_state;
       _spread_state ? initiate_spread.emit() : terminate_spread.emit();
 
       if (!_spread_state)
@@ -230,10 +235,12 @@
 
       bool old_windows_state = _spread_windows_state;
       _spread_state = false;
+      _spread_requested_state = false;
       _spread_windows_state = false;
       terminate_spread.emit();
 
       _spread_state = true;
+      _spread_requested_state = true;
       _spread_windows_state = old_windows_state;
       initiate_spread.emit();
     }
@@ -391,16 +398,26 @@
 
 void PluginAdapter::InitiateScale(std::string const& match, int state)
 {
-  CompOption::Vector argument(1);
-  argument[0].setName("match", CompOption::TypeMatch);
-  argument[0].value().set(CompMatch(match));
-
-  m_ScaleActionList.InitiateAll(argument, state);
+  if (!_spread_requested_state || !_scale_screen)
+  {
+    _spread_requested_state = true;
+    CompOption::Vector argument(1);
+    argument[0].setName("match", CompOption::TypeMatch);
+    argument[0].value().set(CompMatch(match));
+    m_ScaleActionList.InitiateAll(argument, state);
+  }
+  else
+  {
+    terminate_spread.emit();
+    _scale_screen->relayoutSlots(CompMatch(match));
+    initiate_spread.emit();
+  }
 }
 
 void PluginAdapter::TerminateScale()
 {
   m_ScaleActionList.TerminateAll();
+  _spread_requested_state = false;
 }
 
 bool PluginAdapter::IsScaleActive() const
 
=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2015-10-21 14:28:00 +0000
+++ unity-shared/PluginAdapter.h	2015-11-18 16:34:03 +0000
@@ -23,6 +23,7 @@
 /* Compiz */
 #include <core/core.h>
 #include <core/atoms.h>
+#include <scale/scale.h>
 
 #include <NuxCore/Property.h>
 
@@ -214,11 +215,13 @@
   bool IsCurrentViewportEmpty() const;
 
   CompScreen* m_Screen;
+  ScaleScreen* _scale_screen;
   MultiActionList m_ExpoActionList;
   MultiActionList m_ScaleActionList;
 
   float _coverage_area_before_automaximize;
   bool _spread_state;
+  bool _spread_requested_state;
   bool _spread_windows_state;
   bool _expo_state;
   bool _vp_switch_started;
 
=== modified file 'unity-shared/SpreadFilter.cpp'
--- unity-shared/SpreadFilter.cpp	2015-04-07 22:29:54 +0000
+++ unity-shared/SpreadFilter.cpp	2015-11-18 16:34:03 +0000
@@ -106,6 +106,8 @@
       search_bar_->SetSearchFinished();
     }
   });
+
+  ApplicationManager::Default().window_opened.connect(sigc::hide(sigc::mem_fun(this, &Filter::OnWindowChanged)));
 }
 
 bool Filter::Visible() const
@@ -127,26 +129,37 @@
 {
   auto const& lower_search = casefold_copy(text());
   filtered_windows_.clear();
+  title_connections_.Clear();
 
   if (lower_search.empty())
     return;
 
+  auto update_cb = sigc::hide(sigc::mem_fun(this, &Filter::OnWindowChanged));
+
   for (auto const& app : ApplicationManager::Default().GetRunningApplications())
   {
+    title_connections_.Add(app->title.changed.connect(update_cb));
+
     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());
-    }
-  }
+    }
+  }
+
+  for (auto const& win : ApplicationManager::Default().GetWindowsForMonitor(-1))
+  {
+    title_connections_.Add(win->title.changed.connect(update_cb));
+
+    if (casefold_copy(win->title()).find(lower_search) != std::string::npos)
+      filtered_windows_.insert(win->window_id());
+  }
+}
+
+void Filter::OnWindowChanged()
+{
+  UpdateFilteredWindows();
+  text.changed.emit(text);
 }
 
 //
 
=== modified file 'unity-shared/SpreadFilter.h'
--- unity-shared/SpreadFilter.h	2015-04-07 22:29:54 +0000
+++ unity-shared/SpreadFilter.h	2015-11-18 16:34:03 +0000
@@ -25,6 +25,7 @@
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 #include <NuxCore/Animation.h>
+#include <UnityCore/ConnectionManager.h>
 #include "Introspectable.h"
 
 namespace unity
@@ -54,12 +55,14 @@
   void AddProperties(debug::IntrospectionData&);
 
 private:
+  void OnWindowChanged();
   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_;
+  connection::Manager title_connections_;
 };
 
 } // namespace spread