Unity

Merge lp:~3v1n0/unity/fix-panel-dash-interactions-again into lp:unity

  1. fix-panel-dash-interactions-again
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1751
Proposed branch: lp:~3v1n0/unity/fix-panel-dash-interactions-again
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/PanelMenuView.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/fix-panel-dash-interactions-again
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
Review via email: mp+79190@code.launchpad.net

Description of the change

This is needed after the merge of lp:~ismise/unity/fix-864708 due that caused a bug similar to the bug #870844 that I previously fixed (before the merging of the previously mentioned branch) with the lp:~3v1n0/unity/fix-panel-dash-interactions branch.

I'm proposing the fix against lp:unity, however maybe for consistency it should be backported to lp:unity/4.0 too.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
2--- plugins/unityshell/src/PanelMenuView.cpp 2011-10-12 09:50:47 +0000
3+++ plugins/unityshell/src/PanelMenuView.cpp 2011-10-12 22:16:24 +0000
4@@ -1351,7 +1351,7 @@
5 void
6 PanelMenuView::OnMouseClicked(int x, int y, unsigned long button_flags, unsigned long)
7 {
8- if (nux::GetEventButton(button_flags) != 1)
9+ if (nux::GetEventButton(button_flags) != 1 || _places_showing)
10 return;
11
12 guint32 window_xid = GetMaximizedWindow();