Merge lp:~brandontschaefer/unity/lp.1291497-fix into lp:unity

[Brandon Schaefer]

If scale is active, close it before going into lockscreen.

If scale is active, close it before going into lockscreen.

[lp:~brandontschaefer/unity/lp.1291497-fix]

3711. By Brandon Schaefer on 2014-03-13

* Merge parent

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3710
http://jenkins.qa.ubuntu.com/job/unity-ci/797/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/331

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Mh, I guess this won't work if the lockscreen is activated by the screensaver on idle or when suspending...

What about using the "locked" signal of session::Manager?

Unmerged revisions

3711. By Brandon Schaefer on 2014-03-13

* Merge parent

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-13 02:52:37 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-13 02:52:37 +0000
@@ -2530,6 +2530,13 @@
                                      CompOption::Vector& options)
 {
   sources_.AddIdle([this] {
+   PluginAdapter& adapter = PluginAdapter::Default();
+    // FIXME Need to get this work with the signal, but the signal emits
+    // a bit to late causing more problem then the bug it self!
+    // possibly a re-focus function for the session
+    if (adapter.IsScaleActive())
+      adapter.TerminateScale();
+
     session_controller_->LockScreen();
     return false;
   });