[Xfce4-commits] [xfce/xfce4-panel] 01/02: Fix autohide with bg color or image (Bug #16064)

[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 b39978985b90c5c3478aea8fab484d2f2707c4ac
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sun Oct 20 12:09:51 2019 +0200

    Fix autohide with bg color or image (Bug #16064)
    
    We previously didn't set any borders with custom backgrounds, which is
    bad for knowing the panel position. Now we know about the borders but
    simply don't draw them with custom backgrounds.
---
 panel/panel-base-window.c | 4 +---
 panel/panel-window.c      | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 3316a2c..cbcc302 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -654,7 +654,7 @@ panel_base_window_reset_background_css (PanelBaseWindow *window) {
                          &background_rgba, NULL);
 
   /* Set correct border style depending on panel position and length */
-  if (priv->borders != PANEL_BORDER_NONE)
+  if (window->background_style == PANEL_BG_STYLE_NONE)
     {
       border_side = g_strdup_printf ("%s %s %s %s",
                                      PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_TOP) ? "solid" : "none",
@@ -838,8 +838,6 @@ panel_base_window_get_borders (PanelBaseWindow *window)
   if (priv->active_timeout_id != 0)
     return PANEL_BORDER_TOP | PANEL_BORDER_BOTTOM
            | PANEL_BORDER_LEFT | PANEL_BORDER_RIGHT;
-  else if (window->background_style != PANEL_BG_STYLE_NONE)
-    return PANEL_BORDER_NONE;
 
   return priv->borders;
 }
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 91e9492..22c05fb 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2606,6 +2606,9 @@ panel_window_autohide_slideout (gpointer data)
               return FALSE;
             }
         }
+      /* if the panel has no borders, we don't animate */
+      else
+        return FALSE;
     }
   else
     {
@@ -2627,6 +2630,9 @@ panel_window_autohide_slideout (gpointer data)
               return FALSE;
             }
         }
+      /* if the panel has no borders, we don't animate */
+      else
+        return FALSE;
     }
 
   gtk_window_move (GTK_WINDOW (window), x, y);

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