Unity

Merge lp:~3v1n0/unity/right-left-click-maximize-fix into lp:unity

  1. right-left-click-maximize-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3760
Proposed branch: lp:~3v1n0/unity/right-left-click-maximize-fix
Merge into: lp:unity
Diff against target: 20 lines (+6/-3)
1 file modified
decorations/DecorationsGrabEdge.cpp (+6/-3)
To merge this branch: bzr merge lp:~3v1n0/unity/right-left-click-maximize-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+213878@code.launchpad.net

Commit message

DecorationsGrabEdge: Only perform tookit actions on right-click

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/unity-ci/848/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/382

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'decorations/DecorationsGrabEdge.cpp'
2--- decorations/DecorationsGrabEdge.cpp 2014-02-14 18:42:38 +0000
3+++ decorations/DecorationsGrabEdge.cpp 2014-04-02 15:42:12 +0000
4@@ -35,10 +35,13 @@
5
6 void GrabEdge::ButtonDownEvent(CompPoint const& p, unsigned button, Time timestamp)
7 {
8- if (button == 3)
9- screen->toolkitAction(Atoms::toolkitActionWindowMenu, timestamp, win_->id(), button, p.x(), p.y());
10- else if (button != 1)
11+ if (button != 1)
12+ {
13+ if (button == 3)
14+ screen->toolkitAction(Atoms::toolkitActionWindowMenu, timestamp, win_->id(), button, p.x(), p.y());
15+
16 return;
17+ }
18
19 if (!IsMaximizable() && !always_wait_grab_timeout_)
20 {