[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 23/41: Replace GtkStyle.

[noreply at xfce.org]

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

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit d142ec2b999fc526f0679bc7b14b947ab9981189
Author: Graeme Gott <graeme at gottcode.org>
Date:   Fri Aug 12 07:21:28 2016 -0400

    Replace GtkStyle.
---
 panel-plugin/plugin.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/panel-plugin/plugin.cpp b/panel-plugin/plugin.cpp
index 407b2a4..45f3a67 100644
--- a/panel-plugin/plugin.cpp
+++ b/panel-plugin/plugin.cpp
@@ -431,16 +431,21 @@ gboolean Plugin::size_changed(XfcePanelPlugin*, gint size)
 			0, GTK_PACK_START);
 
 	// Load icon
-	GtkStyle* style = gtk_widget_get_style(m_button);
-	gint border = (2 * std::max(style->xthickness, style->ythickness)) + 2;
+	GtkBorder border, padding;
+	GtkStyleContext* context = gtk_widget_get_style_context(m_button);
+	GtkStateFlags state = gtk_style_context_get_state(context);
+	gtk_style_context_get_border(context, state, &border);
+	gtk_style_context_get_padding(context, state, &padding);
+	gint margin_x = border.left + border.right + padding.left + padding.right;
+	gint margin_y = border.top + border.bottom + padding.top + padding.bottom;
 
 	GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(m_plugin));
 	GtkIconTheme* icon_theme = G_LIKELY(screen != NULL) ? gtk_icon_theme_get_for_screen(screen) : NULL;
 
 	gint icon_width_max = (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
-			6 * row_size - border :
-			size - border;
-	gint icon_height_max = row_size - border;
+			6 * row_size - margin_x :
+			size - margin_x;
+	gint icon_height_max = row_size - margin_y;
 	GdkPixbuf* icon = xfce_panel_pixbuf_from_source_at_size(
 			wm_settings->button_icon_name.c_str(),
 			icon_theme,
@@ -464,7 +469,7 @@ gboolean Plugin::size_changed(XfcePanelPlugin*, gint size)
 		if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR &&
 				wm_settings->button_title_visible &&
 				wm_settings->button_icon_visible &&
-				label_size.width <= (size - border - icon_width))
+				label_size.width <= (size - margin_x - icon_width))
 		{
 			orientation = GTK_ORIENTATION_HORIZONTAL;
 		}

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