diff options
| author | Viktor Odintsev <ninetls@xfce.org> | 2017-09-15 06:06:03 +0300 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2017-10-27 16:32:20 +0200 |
| commit | b667211b6acc2de182d1275afc822009c22b0855 (patch) | |
| tree | a5cb6c839a06f95055f75d8220098e31ffba9838 /panel-plugins | |
| parent | 42c6fbafc820cb4147a9dba6941baadbe00d0faf (diff) | |
| download | ixfce4-power-manager-b667211b6acc2de182d1275afc822009c22b0855.tar.gz | |
Use libxfce4panel function to obtain desired icon size
Diffstat (limited to 'panel-plugins')
| -rw-r--r-- | panel-plugins/power-manager-plugin/power-manager-button.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c index 0069f3b4..ad3088cf 100644 --- a/panel-plugins/power-manager-plugin/power-manager-button.c +++ b/panel-plugins/power-manager-plugin/power-manager-button.c @@ -1072,11 +1072,13 @@ power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event) static void power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerManagerButton *button) { +#if !LIBXFCE4PANEL_CHECK_VERSION (4, 13, 0) GtkStyleContext *context; GtkBorder padding, border; gint width; gint xthickness; gint ythickness; +#endif g_return_if_fail (POWER_MANAGER_IS_BUTTON (button)); g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin)); @@ -1084,6 +1086,9 @@ power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerM size /= xfce_panel_plugin_get_nrows (plugin); +#if LIBXFCE4PANEL_CHECK_VERSION (4, 13, 0) + button->priv->panel_icon_width = xfce_panel_plugin_get_icon_size (plugin); +#else /* Calculate the size of the widget because the theme can override it */ context = gtk_widget_get_style_context (GTK_WIDGET (button)); gtk_style_context_get_padding (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &padding); @@ -1104,6 +1109,7 @@ power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerM button->priv->panel_icon_width = 32; else button->priv->panel_icon_width = width; +#endif /* resize the plugin */ gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size); |