diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-04-04 16:15:41 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:18 +0200 |
| commit | 56f79fecce885e05b7fe1677a70b98c64ea4a85c (patch) | |
| tree | 7b2e19ed13500e3c7075873a0326b3b29e510bf8 /gtk/gtkborderimage.c | |
| parent | cfc64627304916e1a1848230dbb426e7dc22251f (diff) | |
| download | gtk+-56f79fecce885e05b7fe1677a70b98c64ea4a85c.tar.gz | |
cssvalue: Add a border value
.. and parse border-image-slice with it.
Diffstat (limited to 'gtk/gtkborderimage.c')
| -rw-r--r-- | gtk/gtkborderimage.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c index 934786075c..f75d7e0e4e 100644 --- a/gtk/gtkborderimage.c +++ b/gtk/gtkborderimage.c @@ -25,7 +25,9 @@ #include <math.h> #include "gtkborderimageprivate.h" +#include "gtkcssbordervalueprivate.h" #include "gtkcssimagevalueprivate.h" +#include "gtkcssnumbervalueprivate.h" #include "gtkcssrepeatvalueprivate.h" #include "gtkstylepropertiesprivate.h" #include "gtkthemingengineprivate.h" @@ -45,7 +47,7 @@ _gtk_border_image_init (GtkBorderImage *image, if (image->source == NULL) return FALSE; - image->slice = *(GtkBorder *) _gtk_css_value_get_boxed (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE)); + image->slice = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE); width = _gtk_css_value_get_boxed (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH)); if (width) { @@ -254,12 +256,12 @@ _gtk_border_image_render (GtkBorderImage *image, gtk_border_image_compute_slice_size (horizontal_slice, source_width, - image->slice.left, - image->slice.right); + _gtk_css_number_value_get (_gtk_css_border_value_get_left (image->slice), source_width), + _gtk_css_number_value_get (_gtk_css_border_value_get_right (image->slice), source_width)); gtk_border_image_compute_slice_size (vertical_slice, source_height, - image->slice.top, - image->slice.bottom); + _gtk_css_number_value_get (_gtk_css_border_value_get_top (image->slice), source_height), + _gtk_css_number_value_get (_gtk_css_border_value_get_bottom (image->slice), source_height)); gtk_border_image_compute_border_size (horizontal_border, x, width, |