Merge lp:~aacid/unity-2d/unmaximizedoubleclickbugfix into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 1100
Merged at revision: 1099
Proposed branch: lp:~aacid/unity-2d/unmaximizedoubleclickbugfix
Merge into: lp:unity-2d
Diff against target: 28 lines (+8/-2)
2 files modified
panel/applets/appname/appnameapplet.cpp (+4/-2)
tests/manual-tests/panel.txt (+4/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/unmaximizedoubleclickbugfix
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+106608@code.launchpad.net

Commit message

[panel] Only react to left mouse button double click

Description of the change

[panel] Only react to left mouse button double click

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Nice, thank you!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/applets/appname/appnameapplet.cpp'
2--- panel/applets/appname/appnameapplet.cpp 2012-04-25 11:47:34 +0000
3+++ panel/applets/appname/appnameapplet.cpp 2012-05-21 10:39:22 +0000
4@@ -392,8 +392,10 @@
5 updateWidgets();
6 }
7
8-void AppNameApplet::mouseDoubleClickEvent(QMouseEvent*) {
9- d->m_windowHelper->unmaximize();
10+void AppNameApplet::mouseDoubleClickEvent(QMouseEvent* event) {
11+ if (event->button() == Qt::LeftButton) {
12+ d->m_windowHelper->unmaximize();
13+ }
14 }
15
16 void AppNameApplet::mousePressEvent(QMouseEvent* event) {
17
18=== modified file 'tests/manual-tests/panel.txt'
19--- tests/manual-tests/panel.txt 2012-04-25 12:58:38 +0000
20+++ tests/manual-tests/panel.txt 2012-05-21 10:39:22 +0000
21@@ -49,3 +49,7 @@
22 * Release the mouse button
23 * Verify the "Save Screenshot" app does not close
24 ----
25+ * Open a window fullscreen (e.g. firefox)
26+ * Go to the panel and double click the middle mouse button
27+ * Verify the fullscreen window stays maximized
28+----

Subscribers

People subscribed via source and target branches