wip: Unbox css valueswip/css-value-unboxing

Keep css values unboxed in the values structs, for faster access
to these values, where it makes sense.

1 files changed, 8 insertions, 10 deletions

diff --git a/gtk/gtkcolumnviewtitle.c b/gtk/gtkcolumnviewtitle.c
index e2e57b29fa..192c74ea59 100644
--- a/gtk/gtkcolumnviewtitle.c
+++ b/gtk/gtkcolumnviewtitle.c
@@ -54,11 +54,9 @@ struct _GtkColumnViewTitleClass
 
 G_DEFINE_TYPE (GtkColumnViewTitle, gtk_column_view_title, GTK_TYPE_WIDGET)
 
-static int
-get_number (GtkCssValue *value)
+static inline int
+ceil_or_floor (float d)
 {
-  double d = _gtk_css_number_value_get (value, 100);
-
   if (d < 1)
     return ceil (d);
   else
@@ -74,12 +72,12 @@ unadjust_width (GtkWidget *widget,
   int css_extra;
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-  css_extra = get_number (style->size->margin_left) +
-              get_number (style->size->margin_right) +
-              get_number (style->border->border_left_width) +
-              get_number (style->border->border_right_width) +
-              get_number (style->size->padding_left) +
-              get_number (style->size->padding_right);
+  css_extra = ceil_or_floor (style->size->_margin[GTK_CSS_LEFT]) +
+              ceil_or_floor (style->size->_margin[GTK_CSS_RIGHT]) +
+              ceil_or_floor (style->border->_border_width[GTK_CSS_LEFT]) +
+              ceil_or_floor (style->border->_border_width[GTK_CSS_RIGHT]) +
+              ceil_or_floor (style->size->_padding[GTK_CSS_LEFT]) +
+              ceil_or_floor (style->size->_padding[GTK_CSS_RIGHT]);
   widget_margins = widget->priv->margin.left + widget->priv->margin.right;
 
   return MAX (0, width - widget_margins - css_extra);