diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-27 22:21:02 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-28 12:27:07 -0500 |
| commit | 2d0d5797358b624b8635b5f80089272f142bf096 (patch) | |
| tree | 6ac7c2d7d71d76dbcfe4804c0518ebf3f4b5f1ad | |
| parent | ac0f524722ebbd8279c5889874cd0a77b220d9c2 (diff) | |
| download | gtk+-2d0d5797358b624b8635b5f80089272f142bf096.tar.gz | |
Unify border-spacing handling
Avoid using GtkStyleContext unnecessarily, just go
to the css node directly.
| -rw-r--r-- | gtk/gtkboxlayout.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcenterlayout.c | 11 | ||||
| -rw-r--r-- | gtk/gtkgridlayout.c | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/gtk/gtkboxlayout.c b/gtk/gtkboxlayout.c index cb9bf024a0..744f6a7f46 100644 --- a/gtk/gtkboxlayout.c +++ b/gtk/gtkboxlayout.c @@ -25,9 +25,9 @@ #include "gtkorientable.h" #include "gtkprivate.h" #include "gtksizerequest.h" -#include "gtkstylecontextprivate.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" +#include "gtkcssnodeprivate.h" /** * SECTION:gtkboxlayout diff --git a/gtk/gtkcenterlayout.c b/gtk/gtkcenterlayout.c index b2dee1db0d..c5264ddaf6 100644 --- a/gtk/gtkcenterlayout.c +++ b/gtk/gtkcenterlayout.c @@ -23,8 +23,8 @@ #include "gtklayoutchild.h" #include "gtkprivate.h" #include "gtksizerequest.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" +#include "gtkcssnodeprivate.h" /** * SECTION:gtkcenterlayout @@ -58,12 +58,13 @@ G_DEFINE_TYPE (GtkCenterLayout, gtk_center_layout, GTK_TYPE_LAYOUT_MANAGER) static int get_spacing (GtkCenterLayout *self, - GtkStyleContext *style_context) + GtkCssNode *node) { + GtkCssStyle *style = gtk_css_node_get_style (node); GtkCssValue *border_spacing; int css_spacing; - border_spacing = _gtk_style_context_peek_property (style_context, GTK_CSS_PROPERTY_BORDER_SPACING); + border_spacing = style->size->border_spacing; if (self->orientation == GTK_ORIENTATION_HORIZONTAL) css_spacing = _gtk_css_position_value_get_x (border_spacing, 100); else @@ -226,7 +227,7 @@ gtk_center_layout_measure_orientation (GtkCenterLayout *self, int spacing; int i; - spacing = get_spacing (self, _gtk_widget_get_style_context (widget)); + spacing = get_spacing (self, gtk_widget_get_css_node (widget)); for (i = 0; i < 3; i ++) { @@ -386,7 +387,7 @@ gtk_center_layout_allocate (GtkLayoutManager *layout_manager, int i; int spacing; - spacing = get_spacing (self, _gtk_widget_get_style_context (widget)); + spacing = get_spacing (self, gtk_widget_get_css_node (widget)); if (self->orientation == GTK_ORIENTATION_HORIZONTAL) { diff --git a/gtk/gtkgridlayout.c b/gtk/gtkgridlayout.c index 77cc7a4e38..3d01787680 100644 --- a/gtk/gtkgridlayout.c +++ b/gtk/gtkgridlayout.c @@ -51,8 +51,8 @@ #include "gtkorientable.h" #include "gtkprivate.h" #include "gtksizerequest.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" +#include "gtkcssnodeprivate.h" /* {{{ GtkGridLayoutChild */ typedef struct { |