Merge lp:~brandontschaefer/unity/mouse-click-outside-dash-closing-fix into lp:unity

[Brandon Schaefer]

On screen keyboard now work with the Dash, when it is outside the Dashs' geo.

=== Problem ===
When you click outside of the dashs geo it will close. If you have have an OSK and click on it, where it is outside of the dashs geo it will close the dash. (This makes OSK uses vs the dash).

=== Fix ===
Take the overlay and check if any windows are above it that are AlwaysOnTop. If there is one then check if the mouse in its geo. If the mouse click is in its geo then do not close th dash.

=== Test ===
Manual test

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

Works fine, it does not cause troubles with always-on-top applications.

review: Approve

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

Ah, before of general approval, it would be nice if you'd change the calls:

nux::Geometry on_top_geo = wm->GetWindowGeometry(top_xid);
nux::Geometry dash_geo = dash_controller_->GetInputWindowGeometry();

to use nux::Geometry const& instead.

[Brandon Schaefer (brandontschaefer)]

Thanks, missed that!

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1513/console reported an error when processing this lp:~brandontschaefer/unity/mouse-click-outside-dash-closing-fix branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1515/console reported an error when processing this lp:~brandontschaefer/unity/mouse-click-outside-dash-closing-fix branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1517/console reported an error when processing this lp:~brandontschaefer/unity/mouse-click-outside-dash-closing-fix branch.
Not merging it.

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/unity-mbs-autolanding/8/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/8/console
    FAILURE: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/8/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://s-jenkins:8080/job/unity-mbs-autolanding/11/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/11/console
    SUCCESS: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/11/console

review: Needs Fixing (continuous-integration)

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-09-13 10:56:42 +0000
+++ manual-tests/Dash.txt	2012-10-10 18:12:19 +0000
@@ -113,6 +113,25 @@
   The screen should look the same as if you had never opened the dash.
 
 
+Test that when an on screen keyboard is used it will not close the Dash.
+------------------------------------------------------------------------
+This tests shows that an on screen keyboards will not close the dash when clicking on it.
+(see lp:1058705)
+
+Setup:
+#. Open the on screen keyboard Onboard.
+#. Move Onboard to the bottom right of the screen.
+#. Open the Dash
+#. Ensure the Dash is not in fullscreen mode.
+#. Ensure that Onboard is outside of the Dash.
+
+Actions:
+#. Use Onboard to type "Hello" in the Dash.
+
+Expected Results:
+  The Dash should stay open, and allow use of the on screen keyboard.
+
+
 Filter Results Tests
 ========================
 These tests show that the dash "All" button works well.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-10-10 10:14:38 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-10 18:12:19 +0000
@@ -1534,13 +1534,16 @@
           skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
 
-
       if (dash_controller_->IsVisible())
       {
         nux::Point pt(event->xbutton.x_root, event->xbutton.y_root);
-        nux::Geometry dash_geo = dash_controller_->GetInputWindowGeometry();
-
-        if (!dash_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt))
+        nux::Geometry const& dash_geo = dash_controller_->GetInputWindowGeometry();
+
+        Window dash_xid = dash_controller_->window()->GetInputWindowId();
+        Window top_xid = wm.GetTopWindowAbove(dash_xid);
+        nux::Geometry const& on_top_geo = wm.GetWindowGeometry(top_xid);
+
+        if (!dash_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt) && !on_top_geo.IsInside(pt))
         {
           dash_controller_->HideDash(false);
         }
@@ -1549,9 +1552,13 @@
       if (hud_controller_->IsVisible())
       {
         nux::Point pt(event->xbutton.x_root, event->xbutton.y_root);
-        nux::Geometry hud_geo = hud_controller_->GetInputWindowGeometry();
-
-        if (!hud_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt))
+        nux::Geometry const& hud_geo = hud_controller_->GetInputWindowGeometry();
+
+        Window hud_xid = hud_controller_->window()->GetInputWindowId();
+        Window top_xid = wm.GetTopWindowAbove(hud_xid);
+        nux::Geometry const& on_top_geo = wm.GetWindowGeometry(top_xid);
+
+        if (!hud_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt) && !on_top_geo.IsInside(pt))
         {
           hud_controller_->HideHud(false);
         }

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2012-10-05 03:45:41 +0000
+++ unity-shared/PluginAdapter.cpp	2012-10-10 18:12:19 +0000
@@ -556,6 +556,31 @@
   return 0;
 }
 
+Window PluginAdapter::GetTopWindowAbove(Window xid) const
+{
+  CompWindow* window;
+  CompPoint screen_vp = m_Screen->vp();
+
+  auto const& windows = m_Screen->windows();
+  for (auto it = windows.rbegin(); it != windows.rend(); ++it)
+  {
+    window = *it;
+    if (window->defaultViewport() == screen_vp &&
+        window->isViewable() && window->isMapped() &&
+        !window->minimized() && !window->inShowDesktopMode() &&
+        !(window->type() & CompWindowTypeDockMask) &&
+        !(window->type() & CompWindowTypeSplashMask))
+    {
+      return window->id();
+    }
+    else if (window->id() == xid)
+    {
+      return 0;
+    }
+  }
+  return 0;
+}
+
 bool PluginAdapter::IsWindowClosable(Window window_id) const
 {
   CompWindow* window = m_Screen->findWindow(window_id);

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2012-10-05 03:45:41 +0000
+++ unity-shared/PluginAdapter.h	2012-10-10 18:12:19 +0000
@@ -179,6 +179,8 @@
 
   void MoveResizeWindow(Window window_id, nux::Geometry geometry);
 
+  Window GetTopWindowAbove(Window xid) const;
+
 protected:
   PluginAdapter(CompScreen* screen);
   void AddProperties(GVariantBuilder* builder);