Unity

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

  1. unity.fix-595880
  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: 338
Proposed branch: lp:~unity-team/unity/unity.fix-595880
Merge into: lp:unity
Diff against target: 47 lines (+15/-1)
2 files modified
unity-private/panel/panel-menu-manager.vala (+4/-0)
unity-private/panel/panel-view.vala (+11/-1)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-595880
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+27944@code.launchpad.net

Description of the change

modified:
  unity-private/panel/panel-menu-manager.vala
  unity-private/panel/panel-view.vala

I've added the a public call popdown_current_menu() to MenuManager and added a signal-handler for "button-release-event" to Unity.Panel.View, which calls the former. This fixes 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
=== modified file 'unity-private/panel/panel-menu-manager.vala'
--- unity-private/panel/panel-menu-manager.vala 2010-06-03 09:53:03 +0000
+++ unity-private/panel/panel-menu-manager.vala 2010-06-18 15:51:32 +0000
@@ -39,6 +39,10 @@
39 current_menu = menu;39 current_menu = menu;
40 }40 }
4141
42 public void popdown_current_menu ()
43 {
44 current_menu.popdown ();
45 }
4246
43 public bool menu_is_open ()47 public bool menu_is_open ()
44 {48 {
4549
=== modified file 'unity-private/panel/panel-view.vala'
--- unity-private/panel/panel-view.vala 2010-06-10 03:37:34 +0000
+++ unity-private/panel/panel-view.vala 2010-06-18 15:51:32 +0000
@@ -37,7 +37,7 @@
37 public View (Shell shell)37 public View (Shell shell)
38 {38 {
39 Object (shell:shell,39 Object (shell:shell,
40 reactive:false,40 reactive:true,
41 orientation:Ctk.Orientation.HORIZONTAL,41 orientation:Ctk.Orientation.HORIZONTAL,
42 homogeneous:false,42 homogeneous:false,
43 spacing:0);43 spacing:0);
@@ -74,9 +74,19 @@
74 pack (indicator_bar, false, true);74 pack (indicator_bar, false, true);
75 indicator_bar.show ();75 indicator_bar.show ();
7676
77 this.button_release_event.connect (this.on_button_release_event);
78
77 END_FUNCTION ();79 END_FUNCTION ();
78 }80 }
7981
82 private bool on_button_release_event (Clutter.Event e)
83 {
84 MenuManager manager = MenuManager.get_default ();
85 manager.popdown_current_menu ();
86
87 return false;
88 }
89
80 public int get_indicators_width ()90 public int get_indicators_width ()
81 {91 {
82 return (int) this.indicator_bar.get_width ();92 return (int) this.indicator_bar.get_width ();