gnome-panel r11456 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Tue Jan 20 13:22:57 2009
New Revision: 11456
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11456&view=rev

Log:
2009-01-20  Vincent Untz  <vuntz gnome org>

	* panel-toplevel.c: (panel_toplevel_update_struts): do not recompute
	the end position of the initial animation, since it's not needed, and
	it overrides the struts conflict resolution.


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel-toplevel.c

Modified: trunk/gnome-panel/panel-toplevel.c
==============================================================================
--- trunk/gnome-panel/panel-toplevel.c	(original)
+++ trunk/gnome-panel/panel-toplevel.c	Tue Jan 20 13:22:57 2009
@@ -1397,8 +1397,14 @@
 	 * represent what is at the end of the animation, to avoid desktop
 	 * icons jumping around. */
 	if (!toplevel->priv->initial_animation_done) {
-		panel_toplevel_calculate_animation_end_geometry (toplevel);
 		end_of_animation = TRUE;
+
+		/* We've not started the animation yet, so we have to compute
+		 * where we want to end. Note that we don't want to compute
+		 * this everytime, since the struts conflict resolution will be
+		 * overridden if we do so */
+		if (!toplevel->priv->animating)
+			panel_toplevel_calculate_animation_end_geometry (toplevel);
 	}
 
 	screen = panel_toplevel_get_monitor_geometry (toplevel,
@@ -2160,7 +2166,6 @@
 		return;
 	}
 
-
 	if (toplevel->priv->position_centered) {
 		toplevel->priv->position_centered = FALSE;