Merge lp:~3v1n0/unity/scaled-windows-filtering-out-reset into lp:unity

[Marco Trevisan (Treviño)]

UnityScreen: when filtering out windows in spread, make sure we unscale them

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3885
http://jenkins.qa.ubuntu.com/job/unity-ci/1109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/196

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

Just a small comment.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-10-16 15:10:15 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-10-22 16:30:47 +0000
@@ -538,7 +538,19 @@
     else
     {
       CompMatch windows_match;
-      for (auto xid : spread_filter_->FilteredWindows())
+      auto const& filtered_windows = spread_filter_->FilteredWindows();
+
+      for (auto const& swin : sScreen->getWindows())
+      {
+        if (std::find(filtered_windows.begin(), filtered_windows.end(), swin->window->id()) != filtered_windows.end())
+          continue;
+
+        auto* uwin = UnityWindow::get(swin->window);
+        uwin->OnTerminateSpread();
+        fake_decorated_windows_.erase(uwin);
+      }
+
+      for (auto xid : filtered_windows)
         windows_match |= "xid="+std::to_string(xid);
 
       auto match = sScreen->getCustomMatch();
@@ -4430,7 +4442,7 @@
     }
     else
     {
-      window->setShowDesktopMode (false);
+      window->setShowDesktopMode(false);
     }
   }
 }