Unity

Merge lp:~om26er/unity/fix-769703-stable into lp:unity/3.0

  1. fix-769703-stable
  2. Merge into branch-3.0
Proposed by Omer Akram
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1210
Proposed branch: lp:~om26er/unity/fix-769703-stable
Merge into: lp:unity/3.0
Diff against target: 12 lines (+1/-1)
1 file modified
src/Launcher.cpp (+1/-1)
To merge this branch: bzr merge lp:~om26er/unity/fix-769703-stable
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Andrea Azzarone (community) Approve
Review via email: mp+71009@code.launchpad.net

Description of the change

Daniel van Vugt fixed a dead line of code in Launcher.cpp:
https://code.launchpad.net/~vanvugt/unity/fix-805327/+merge/66749

later it turned out that commit fixes a very annoying bug 769703 where launcher won't autohide after you drag something in a Qt based application. I am just backporting that fix for 3.0 series

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Looks good! Approve.

review: Approve
Revision history for this message
Tim Penhey (thumper) wrote :

 merge approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Launcher.cpp'
2--- src/Launcher.cpp 2011-06-17 09:59:17 +0000
3+++ src/Launcher.cpp 2011-08-10 09:43:36 +0000
4@@ -1948,7 +1948,7 @@
5 unsigned int mask;
6 XQueryPointer (self->_screen->dpy (), self->_screen->root (), &root_r, &child_r, &root_x_r, &root_y_r, &win_x_r, &win_y_r, &mask);
7
8- if (drag_owner && (mask | (Button1Mask & Button2Mask & Button3Mask)))
9+ if (drag_owner && (mask & (Button1Mask | Button2Mask | Button3Mask)))
10 {
11 self->_hide_machine->SetQuirk (LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
12 return true;

Subscribers

People subscribed via source and target branches

to all changes: