Merge lp:~sjakthol/unity/fix-1288789 into lp:unity

[Sami Jaktholm]

Scale: Correctly detect the activation of a scale and set scale_just_activated_
to true properly.

If Super+W was pressed and Super was released faster than super_tap_duration, showLauncherKeyTerminate would terminate scale because scale_just_activated_ was never set to true due to timing issue. scale_just_activated_ would've been set to true in handleCompizEvent if PluginAdapter knew scale was active. However the grab event PluginAdapter relies on arrives a little bit later than handleCompizEvent is called for scale activation.

Instead of asking plugin adapter about scale state this branch uses the value provided by the event itself.

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

Cool, thank you very much!

The fix is fine, and it works very well!

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-10 17:43:34 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-11 13:13:17 +0000
@@ -1984,10 +1984,10 @@
     ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
   }
 
-  if (adapter.IsScaleActive() && g_strcmp0(plugin, "scale") == 0 &&
-      super_keypressed_)
+  if (super_keypressed_ && g_strcmp0(plugin, "scale") == 0 &&
+      g_strcmp0(event, "activate") == 0)
   {
-    scale_just_activated_ = true;
+    scale_just_activated_ = CompOption::getBoolOptionNamed(option, "active");
   }
 
   screen->handleCompizEvent(plugin, event, option);