diff options
| author | Gord Allott <gord.allott@canonical.com> | 2010-09-14 12:48:10 +0100 |
|---|---|---|
| committer | Gord Allott <gord.allott@canonical.com> | 2010-09-14 12:48:10 +0100 |
| commit | 492aad3ba23edfec88429124a563fb30afa41914 (patch) | |
| tree | c628b4da922bf2e765375597941f9ac0654ad93b /unity-private/launcher | |
| parent | f3f86c4cab8a856f72b1ce7018acfca3b8013886 (diff) | |
fix for small double menu problem introduced with this branches changes
(bzr r495.2.6)
Diffstat (limited to 'unity-private/launcher')
| -rw-r--r-- | unity-private/launcher/scrollerchild-controller.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unity-private/launcher/scrollerchild-controller.vala b/unity-private/launcher/scrollerchild-controller.vala index a3c961732..f43c1f748 100644 --- a/unity-private/launcher/scrollerchild-controller.vala +++ b/unity-private/launcher/scrollerchild-controller.vala @@ -59,7 +59,7 @@ namespace Unity.Launcher construct { theme_file_path = new Unity.ThemeFilePath (); - name = "Bug Found, You Defeated Unity"; + name = "Bug Found, You Defeated Unity, +20 exp"; child.controller = this; child.button_press_event.connect (on_press_event); child.button_release_event.connect (on_release_event); @@ -106,12 +106,12 @@ namespace Unity.Launcher private bool on_leave_event (Clutter.Event event) { button_down = false; + menu_state = ScrollerChildControllerMenuState.NO_MENU; if (menu_state != ScrollerChildControllerMenuState.MENU) { - menu_state = ScrollerChildControllerMenuState.NO_MENU; + ensure_menu_state (); } - ensure_menu_state (); return false; } private bool no_activate = false; @@ -199,7 +199,7 @@ namespace Unity.Launcher { // there is a menu open already, attach to the destroy so we can // re-ensure later - QuicklistController.get_current_menu ().get_view ().destroy.connect (ensure_menu_state); + //QuicklistController.get_current_menu ().get_view ().destroy.connect (ensure_menu_state); return; } |