summaryrefslogtreecommitdiff
path: root/gtk/inspector/layoutoverlay.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/inspector/layoutoverlay.c')
-rw-r--r--gtk/inspector/layoutoverlay.c42
1 files changed, 20 insertions, 22 deletions
diff --git a/gtk/inspector/layoutoverlay.c b/gtk/inspector/layoutoverlay.c
index a72a40940e..b977bd077f 100644
--- a/gtk/inspector/layoutoverlay.c
+++ b/gtk/inspector/layoutoverlay.c
@@ -20,45 +20,43 @@ struct _GtkLayoutOverlayClass
G_DEFINE_TYPE (GtkLayoutOverlay, gtk_layout_overlay, GTK_TYPE_INSPECTOR_OVERLAY)
-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);
+ return ceilf (d);
else
- return floor (d);
+ return floorf (d);
}
-static void
+static inline void
get_box_margin (GtkCssStyle *style,
GtkBorder *margin)
{
- margin->top = get_number (style->size->margin_top);
- margin->left = get_number (style->size->margin_left);
- margin->bottom = get_number (style->size->margin_bottom);
- margin->right = get_number (style->size->margin_right);
+ margin->top = ceil_or_floor (style->size->_margin[GTK_CSS_TOP]);
+ margin->right = ceil_or_floor (style->size->_margin[GTK_CSS_RIGHT]);
+ margin->bottom = ceil_or_floor (style->size->_margin[GTK_CSS_BOTTOM]);
+ margin->left = ceil_or_floor (style->size->_margin[GTK_CSS_LEFT]);
}
-static void
+static inline void
get_box_border (GtkCssStyle *style,
GtkBorder *border)
{
- border->top = get_number (style->border->border_top_width);
- border->left = get_number (style->border->border_left_width);
- border->bottom = get_number (style->border->border_bottom_width);
- border->right = get_number (style->border->border_right_width);
+ border->top = ceil_or_floor (style->border->_border_width[GTK_CSS_TOP]);
+ border->right = ceil_or_floor (style->border->_border_width[GTK_CSS_RIGHT]);
+ border->bottom = ceil_or_floor (style->border->_border_width[GTK_CSS_BOTTOM]);
+ border->left = ceil_or_floor (style->border->_border_width[GTK_CSS_LEFT]);
}
-static void
+static inline void
get_box_padding (GtkCssStyle *style,
- GtkBorder *border)
+ GtkBorder *padding)
{
- border->top = get_number (style->size->padding_top);
- border->left = get_number (style->size->padding_left);
- border->bottom = get_number (style->size->padding_bottom);
- border->right = get_number (style->size->padding_right);
+ padding->top = ceil_or_floor (style->size->_padding[GTK_CSS_TOP]);
+ padding->right = ceil_or_floor (style->size->_padding[GTK_CSS_RIGHT]);
+ padding->bottom = ceil_or_floor (style->size->_padding[GTK_CSS_BOTTOM]);
+ padding->left = ceil_or_floor (style->size->_padding[GTK_CSS_LEFT]);
}
static void