[Xfce4-commits] <xfce4-terminal:master> Fix window resizing with animations enabled.

[Nick Schermer]

Updating branch refs/heads/master
         to b0e9ada613dc6283f99ab1f05bf2bb65198e7c65 (commit)
       from e2ef16c1b036391879248ae9be69414307849284 (commit)

commit b0e9ada613dc6283f99ab1f05bf2bb65198e7c65
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Dec 30 12:40:09 2012 +0100

    Fix window resizing with animations enabled.

 terminal/terminal-window-dropdown.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c
index 8f5950a..4eff5b0 100644
--- a/terminal/terminal-window-dropdown.c
+++ b/terminal/terminal-window-dropdown.c
@@ -617,21 +617,25 @@ static void
 terminal_window_dropdown_show (TerminalWindowDropdown *dropdown,
                                guint32                 timestamp)
 {
-  TerminalWindow *window = TERMINAL_WINDOW (dropdown);
-  gint            w, h;
-  GdkRectangle    monitor_geo;
-  gint            x_dest, y_dest;
-  gint            xpad, ypad;
-  glong           char_width, char_height;
-  GtkRequisition  req1, req2;
-  gboolean        move_to_active;
-  gboolean        visible;
-  gint            viewport_h;
+  TerminalWindow    *window = TERMINAL_WINDOW (dropdown);
+  gint               w, h;
+  GdkRectangle       monitor_geo;
+  gint               x_dest, y_dest;
+  gint               xpad, ypad;
+  glong              char_width, char_height;
+  GtkRequisition     req1, req2;
+  gboolean           move_to_active;
+  gboolean           visible;
+  gint               viewport_h;
+  TerminalDirection  old_animation_dir = ANIMATION_DIR_NONE;
 
   visible = gtk_widget_get_visible (GTK_WIDGET (dropdown));
 
   if (dropdown->animation_timeout_id != 0)
-    g_source_remove (dropdown->animation_timeout_id);
+    {
+      old_animation_dir = dropdown->animation_dir;
+      g_source_remove (dropdown->animation_timeout_id);
+    }
 
   g_object_get (G_OBJECT (window->preferences),
                 "dropdown-move-to-active", &move_to_active,
@@ -689,7 +693,7 @@ terminal_window_dropdown_show (TerminalWindowDropdown *dropdown,
           /* start animation collapsed */
           viewport_h = 0;
         }
-      else
+      else if (old_animation_dir == ANIMATION_DIR_UP)
         {
           /* pick up where we aborted */
           gtk_widget_size_request (dropdown->viewport, &req1);