[Xfce4-commits] [xfce/xfce4-panel] 04/05: autohide: Cancel the animation when needed

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit a9a1b9e7ac9004b52472459ec58822c407c44908
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Oct 14 00:08:16 2019 +0200

    autohide: Cancel the animation when needed
---
 panel/panel-window.c | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index 6e00045..b32844a 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -542,6 +542,7 @@ panel_window_init (PanelWindow *window)
   window->autohide_behavior = AUTOHIDE_BEHAVIOR_NEVER;
   window->autohide_state = AUTOHIDE_DISABLED;
   window->autohide_timeout_id = 0;
+  window->autohide_fade_id = 0;
   window->autohide_block = 0;
   window->autohide_grab_block = 0;
   window->autohide_size = DEFAULT_ATUOHIDE_SIZE;
@@ -821,6 +822,9 @@ panel_window_finalize (GObject *object)
   if (G_UNLIKELY (window->autohide_timeout_id != 0))
     g_source_remove (window->autohide_timeout_id);
 
+  if (G_UNLIKELY (window->autohide_fade_id != 0))
+    g_source_remove (window->autohide_fade_id);
+
   /* destroy the autohide window */
   if (window->autohide_window != NULL)
     gtk_widget_destroy (window->autohide_window);
@@ -929,6 +933,9 @@ panel_window_enter_notify_event (GtkWidget        *widget,
       if (window->autohide_timeout_id != 0)
         g_source_remove (window->autohide_timeout_id);
 
+      if (window->autohide_fade_id != 0)
+        g_source_remove (window->autohide_fade_id);
+
       /* update autohide status */
       if (window->autohide_state == AUTOHIDE_POPDOWN)
         window->autohide_state = AUTOHIDE_VISIBLE;
@@ -1452,6 +1459,7 @@ panel_window_size_allocate (GtkWidget     *widget,
                                        -9999, -9999, -1, -1);
 
       gtk_window_move (GTK_WINDOW (window), window->alloc.x, window->alloc.y);
+      window->autohide_fade_id = 0;
     }
 
   child = gtk_bin_get_child (GTK_BIN (widget));
@@ -2404,6 +2412,7 @@ static void
 panel_window_autohide_timeout_destroy (gpointer user_data)
 {
   PANEL_WINDOW (user_data)->autohide_timeout_id = 0;
+  PANEL_WINDOW (user_data)->autohide_fade_id = 0;
 }
 
 
@@ -2420,6 +2429,9 @@ panel_window_autohide_queue (PanelWindow   *window,
   if (window->autohide_timeout_id != 0)
     g_source_remove (window->autohide_timeout_id);
 
+  if (window->autohide_fade_id != 0)
+    g_source_remove (window->autohide_fade_id);
+
   /* set new autohide state */
   window->autohide_state = new_state;
 
@@ -2486,6 +2498,9 @@ panel_window_autohide_drag_leave (GtkWidget      *widget,
   if (window->autohide_timeout_id != 0)
     g_source_remove (window->autohide_timeout_id);
 
+  if (window->autohide_fade_id != 0)
+    g_source_remove (window->autohide_fade_id);
+
   /* update the status */
   if (window->autohide_state == AUTOHIDE_POPUP)
     window->autohide_state = AUTOHIDE_HIDDEN;
@@ -2530,13 +2545,19 @@ panel_window_autohide_slideout (gpointer data)
           y--;
 
           if (y < (0 - window->alloc.height - 1))
-            return FALSE;
+            {
+              window->autohide_fade_id = 0;
+              return FALSE;
+            }
         }
       else if (PANEL_HAS_FLAG (borders, PANEL_BORDER_TOP))
         {
           y++;
           if (y > (h + window->alloc.height + 1))
-            return FALSE;
+            {
+              window->autohide_fade_id = 0;
+              return FALSE;
+            }
         }
     }
   else
@@ -2545,13 +2566,19 @@ panel_window_autohide_slideout (gpointer data)
         {
           x--;
           if (x < (0 - window->alloc.width + 1))
-            return FALSE;
+            {
+              window->autohide_fade_id = 0;
+              return FALSE;
+            }
         }
       else if (PANEL_HAS_FLAG (borders, PANEL_BORDER_LEFT))
         {
           x++;
           if (x > (w + window->alloc.width + 1))
-            return FALSE;
+            {
+              window->autohide_fade_id = 0;
+              return FALSE;
+            }
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.