Ubuntu

Merge lp:~om26er/ubuntu/natty/unity/unity-fix-769703-3 into lp:~ubuntu-desktop/unity/natty

Proposed by Omer Akram on 2011-08-10
Status: Merged
Merged at revision: 466
Proposed branch: lp:~om26er/ubuntu/natty/unity/unity-fix-769703-3
Merge into: lp:~ubuntu-desktop/unity/natty
Diff against target: 27 lines (+8/-1) 2 files modified
To merge this branch: bzr merge lp:~om26er/ubuntu/natty/unity/unity-fix-769703-3
Reviewer Review Type Date Requested Status
Didier Roche 2011-08-10 Approve on 2011-08-12
Ubuntu Sponsors Team 2011-08-10 Pending
Review via email: mp+71021@code.launchpad.net

Description of the Change

Backport a one line fix from trunk:
https://code.launchpad.net/~vanvugt/unity/fix-805327

to fix a very annoying bug where dragging anything in a Qt app would make launcher stuck

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Looks good! Thanks for backporting this more than needed fix there :)

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-17 11:02:42 +0000
3+++ debian/changelog 2011-08-10 10:39:28 +0000
4@@ -1,3 +1,10 @@
5+unity (3.8.16-0ubuntu1~natty1.1) natty-proposed; urgency=low
6+
7+ * src/Launcher.cpp:
8+ - Launcher does not autohide after drag in Qt apps. (LP: #769703)
9+
10+ -- Omer Akram <om26er@ubuntu.com> Wed, 10 Aug 2011 15:24:51 +0500
11+
12 unity (3.8.16-0ubuntu1~natty1) natty-proposed; urgency=low
13
14 * New upstream version:
15
16=== modified file 'src/Launcher.cpp'
17--- src/Launcher.cpp 2011-06-17 10:20:23 +0000
18+++ src/Launcher.cpp 2011-08-10 10:39:28 +0000
19@@ -1948,7 +1948,7 @@
20 unsigned int mask;
21 XQueryPointer (self->_screen->dpy (), self->_screen->root (), &root_r, &child_r, &root_x_r, &root_y_r, &win_x_r, &win_y_r, &mask);
22
23- if (drag_owner && (mask | (Button1Mask & Button2Mask & Button3Mask)))
24+ if (drag_owner && (mask & (Button1Mask | Button2Mask | Button3Mask)))
25 {
26 self->_hide_machine->SetQuirk (LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
27 return true;

Subscribers

People subscribed via source and target branches

to all changes: