Merge lp:~azzar1/unity/fix-dnd-alttab into lp:unity

[Andrea Azzarone]

Allow alt-tabbing during a dnd operation.

== Problem ==
#111939: Alt-Tab - Not possible to alt-tab during a drag-and-drop operation.

== Fix ==
Don't require mouse grabbing during alt-tab. Try to get it, but if the mouse is already grabbed (during the dnd the mouse grabbing belongs to the source window), perform the alt-tab anyway.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3293
http://jenkins.qa.ubuntu.com/job/unity-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/5

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

review: Approve (continuous-integration)

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

Looks good to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/71
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/71/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/71

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-08 23:26:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-04-10 18:15:25 +0000
@@ -1867,8 +1867,6 @@
 {
   if (!grab_index_)
     grab_index_ = screen->pushGrab (screen->invisibleCursor(), "unity-switcher");
-  if (!grab_index_)
-    return false;
 
   screen->addAction(&optionGetAltTabRight());
   screen->addAction(&optionGetAltTabDetailStart());
@@ -1929,24 +1927,24 @@
     // remove grab before calling hide so workspace switcher doesn't fail
     screen->removeGrab(grab_index_, NULL);
     grab_index_ = 0;
-
-    screen->removeAction(&optionGetAltTabRight ());
-    screen->removeAction(&optionGetAltTabDetailStart ());
-    screen->removeAction(&optionGetAltTabDetailStop ());
-    screen->removeAction(&optionGetAltTabLeft ());
-
-    /* Removing the scroll actions */
-    CompAction scroll_up;
-    CompAction scroll_down;
-    scroll_up.setButton(CompAction::ButtonBinding(local::SCROLL_UP_BUTTON, action->key().modifiers()));
-    scroll_down.setButton(CompAction::ButtonBinding(local::SCROLL_DOWN_BUTTON, action->key().modifiers()));
-    screen->removeAction(&scroll_up);
-    screen->removeAction(&scroll_down);
-
-    bool accept_state = (state & CompAction::StateCancel) == 0;
-    switcher_controller_->Hide(accept_state);
   }
 
+  screen->removeAction(&optionGetAltTabRight ());
+  screen->removeAction(&optionGetAltTabDetailStart ());
+  screen->removeAction(&optionGetAltTabDetailStop ());
+  screen->removeAction(&optionGetAltTabLeft ());
+
+  /* Removing the scroll actions */
+  CompAction scroll_up;
+  CompAction scroll_down;
+  scroll_up.setButton(CompAction::ButtonBinding(local::SCROLL_UP_BUTTON, action->key().modifiers()));
+  scroll_down.setButton(CompAction::ButtonBinding(local::SCROLL_DOWN_BUTTON, action->key().modifiers()));
+  screen->removeAction(&scroll_up);
+  screen->removeAction(&scroll_down);
+
+  bool accept_state = (state & CompAction::StateCancel) == 0;
+  switcher_controller_->Hide(accept_state);
+
   action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
   return true;
 }