[Xfce4-commits] [xfce/xfce4-panel] 01/01: Removed button theme checking from _get_icon_size()

[noreply at xfce.org]

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

andrzejr pushed a commit to branch master
in repository xfce/xfce4-panel.

commit 1f85c9f5f93be9f8b64ddaa42a3aae9be91046b8
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Mar 19 09:41:06 2017 +0000

    Removed button theme checking from _get_icon_size()
    
    If we are happy with this behaviour I'll remove the button argument.
    (plugins using _get_icon_size() will have to be modified)
---
 libxfce4panel/xfce-panel-plugin.c | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index d4762fa..d83e0fa 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1969,37 +1969,18 @@ xfce_panel_plugin_get_icon_size (XfcePanelPlugin *plugin,
                                  GtkWidget       *button)
 {
   gint width;
-#if GTK_CHECK_VERSION (3, 0, 0)
-  GtkStyleContext *context;
-  GtkBorder padding, border;
-  gint xthickness;
-  gint ythickness;
-
-  g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), 24);
-  g_return_val_if_fail (XFCE_PANEL_PLUGIN_CONSTRUCTED (plugin), 24);
-  g_return_val_if_fail (GTK_IS_WIDGET (button), 24);
-
-  /* Calculate the size of the widget because the theme can override it */
-  context = gtk_widget_get_style_context (button);
-  gtk_style_context_get_padding (context, gtk_widget_get_state_flags (button), &padding);
-  gtk_style_context_get_border (context, gtk_widget_get_state_flags (button), &border);
-  xthickness = padding.left + padding.right + border.left + border.right;
-  ythickness = padding.top + padding.bottom + border.top + border.bottom;
-
-  /* Calculate the size of the space left for the icon */
-  width = xfce_panel_plugin_get_size (plugin) / xfce_panel_plugin_get_nrows (plugin) - 2 * MAX (xthickness, ythickness);
-#else
-  /* simple fallback for gtk2 */
-  width = xfce_panel_plugin_get_size (plugin) / xfce_panel_plugin_get_nrows (plugin) - 2;
-#endif
+  width = xfce_panel_plugin_get_size (plugin) / xfce_panel_plugin_get_nrows (plugin);
 
   /* Since symbolic icons are usually only provided in 16px we
    * try to be clever and use size steps */
-  if (width <= 21)
+  if (width < 26)
     return 16;
-  else if (width >=22 && width <= 29)
+  /* else if (width < 26)
+   *   return 22;
+   */
+  else if (width < 34)
     return 24;
-  else if (width >= 30 && width <= 40)
+  else if (width < 40)
     return 32;
   else
     return width;

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