From f3ff9e94de50ee55a9f199939dd5bd9dc9b76adc Mon Sep 17 00:00:00 2001 From: Gord Allott Date: Thu, 26 Aug 2010 14:00:32 +0100 Subject: potential fix for problematic unfolding of launcher (bzr r433.7.2) --- unity-private/launcher/scroller-view.vala | 2 +- unity-private/testing/test-window.vala | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'unity-private') diff --git a/unity-private/launcher/scroller-view.vala b/unity-private/launcher/scroller-view.vala index 1ae1f4d43..472e4b220 100644 --- a/unity-private/launcher/scroller-view.vala +++ b/unity-private/launcher/scroller-view.vala @@ -1278,7 +1278,7 @@ namespace Unity.Launcher float position, float rotation, bool immediate = false) { - if (immediate) + if (immediate || global_shell.is_starting) { child.position = position; child.force_rotation_jump (rotation); diff --git a/unity-private/testing/test-window.vala b/unity-private/testing/test-window.vala index ec747f3fd..9ed939214 100644 --- a/unity-private/testing/test-window.vala +++ b/unity-private/testing/test-window.vala @@ -27,6 +27,7 @@ namespace Unity.Testing { public bool menus_swallow_events { get { return true; } } public bool super_key_active {get; set;} + public bool is_starting {get; set;} public bool is_popup { get; construct; } public int popup_width { get; construct; } public int popup_height { get; construct; } @@ -53,6 +54,7 @@ namespace Unity.Testing construct { + is_starting = true; START_FUNCTION (); Unity.global_shell = this; this.workarea_size = new Workarea (); @@ -156,6 +158,7 @@ namespace Unity.Testing this.wnck_screen.active_window_changed.connect (this.on_active_window_changed); } + GLib.Idle.add (() => { is_starting = false; return false;}); END_FUNCTION (); } -- cgit v1.2.3