[Xfce4-commits] <xfce4-panel:master> PanelImage: do not reload fixed-size icons on style-updated.

[Nick Schermer]

Updating branch refs/heads/master
         to 6faa922db9eb527415d48e5890e663cf7f3fab66 (commit)
       from a406ed5311bbe0929b949f28f0f9afeb398b4f4e (commit)

commit 6faa922db9eb527415d48e5890e663cf7f3fab66
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Mon Apr 22 23:58:10 2013 +0100

    PanelImage: do not reload fixed-size icons on style-updated.
    
    Style-updated triggered a lot of flickering in the applications menu
    on mouse hover events.
    
    Are there any use cases where reloading the icons is needed?

 libxfce4panel/xfce-panel-image.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index ded78ea..8073040 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -622,8 +622,10 @@ xfce_panel_image_style_updated (GtkWidget *widget)
     }
 
   /* update the icon if we have an icon-name source */
+  /* and size is not set */
   if (priv->source != NULL
-      && !g_path_is_absolute (priv->source))
+      && !g_path_is_absolute (priv->source)
+      && priv->size <= 0)
     {
       /* unset the size to force an update */
       priv->width = priv->height = -1;