[gimp/gtk3-port: 115/234] app: port GimpContainerTreeView to GtkStyleContext
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 115/234] app: port GimpContainerTreeView to GtkStyleContext
- Date: Tue, 9 May 2017 22:26:44 +0000 (UTC)
commit 3587d4aaf1b5ceb3982225d50ffd0a541c54e5f7
Author: Michael Natterer <mitch gimp org>
Date: Sun Dec 19 13:10:51 2010 +0100
app: port GimpContainerTreeView to GtkStyleContext
app/widgets/gimpcontainertreeview.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c
index b679de3..9c2866b 100644
--- a/app/widgets/gimpcontainertreeview.c
+++ b/app/widgets/gimpcontainertreeview.c
@@ -451,10 +451,13 @@ gimp_container_tree_view_menu_position (GtkMenu *menu,
}
else
{
- GtkStyle *style = gtk_widget_get_style (widget);
+ GtkStyleContext *style = gtk_widget_get_style_context (widget);
+ GtkBorder border;
- *x += style->xthickness;
- *y += style->ythickness;
+ gtk_style_context_get_border (style, 0, &border);
+
+ *x += border.left;
+ *y += border.top;
}
gimp_menu_position (menu, x, y);
@@ -856,15 +859,21 @@ gimp_container_tree_view_set_view_size (GimpContainerView *view)
if (icon_name)
{
- GtkStyle *style = gtk_widget_get_style (tree_widget);
+ GtkStyleContext *style = gtk_widget_get_style_context (tree_widget);
+ GtkBorder border;
+
+ gtk_style_context_save (style);
+ gtk_style_context_add_class (style, GTK_STYLE_CLASS_BUTTON);
+ gtk_style_context_get_border (style, 0, &border);
+ gtk_style_context_restore (style);
icon_size = gimp_get_icon_size (tree_widget,
icon_name,
GTK_ICON_SIZE_BUTTON,
view_size -
- 2 * style->xthickness,
+ (border.left + border.right),
view_size -
- 2 * style->ythickness);
+ (border.top + border.bottom));
g_object_set (list->data, "stock-size", icon_size, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]