Unity

Merge lp:~unity-team/unity/unity.fix-595880-2 into lp:unity

  1. unity.fix-595880-2
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Mirco Müller
Approved revision: no longer in the source branch.
Merged at revision: 340
Proposed branch: lp:~unity-team/unity/unity.fix-595880-2
Merge into: lp:unity
Diff against target: 27 lines (+6/-0)
2 files modified
unity-private/launcher/scroller-view.vala (+4/-0)
unity-private/panel/panel-home-button.vala (+2/-0)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-595880-2
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+28034@code.launchpad.net

Description of the change

modified:
  unity-private/launcher/scroller-view.vala
  unity-private/panel/panel-home-button.vala

This makes sure also clicks on home-button (Ubuntu-logo), launcher-icon or empty launcher-area close any open panel/indicator menu.

Completes fix for LP: #595880.

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-private/launcher/scroller-view.vala'
2--- unity-private/launcher/scroller-view.vala 2010-06-17 10:14:24 +0000
3+++ unity-private/launcher/scroller-view.vala 2010-06-21 09:19:22 +0000
4@@ -316,6 +316,10 @@
5 }
6 fling_timeline.start ();
7 }
8+
9+ MenuManager manager = MenuManager.get_default ();
10+ manager.popdown_current_menu ();
11+
12 return true;
13 }
14
15
16=== modified file 'unity-private/panel/panel-home-button.vala'
17--- unity-private/panel/panel-home-button.vala 2010-06-03 17:20:37 +0000
18+++ unity-private/panel/panel-home-button.vala 2010-06-21 09:19:22 +0000
19@@ -107,6 +107,8 @@
20 private bool on_button_release (Clutter.Event event)
21 {
22 shell.show_unity ();
23+ MenuManager manager = MenuManager.get_default ();
24+ manager.popdown_current_menu ();
25 return true;
26 }
27 }