[gtk+] borderimage: Use style context as argument
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] borderimage: Use style context as argument
- Date: Sat, 16 Aug 2014 17:40:14 +0000 (UTC)
commit 1a143cd272c12b08caa8bee1f76c5e9628d2af1c
Author: Benjamin Otte <otte redhat com>
Date: Sat Aug 16 19:00:03 2014 +0200
borderimage: Use style context as argument
... not the theming engine.
gtk/gtkborderimage.c | 10 +++++-----
gtk/gtkborderimageprivate.h | 3 +--
gtk/gtkthemingengine.c | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c
index 694db6f..b6e7346 100644
--- a/gtk/gtkborderimage.c
+++ b/gtk/gtkborderimage.c
@@ -39,15 +39,15 @@
gboolean
_gtk_border_image_init (GtkBorderImage *image,
- GtkThemingEngine *engine)
+ GtkStyleContext *context)
{
- image->source = _gtk_css_image_value_get_image (_gtk_theming_engine_peek_property (engine,
GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE));
+ image->source = _gtk_css_image_value_get_image (_gtk_style_context_peek_property (context,
GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE));
if (image->source == NULL)
return FALSE;
- image->slice = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE);
- image->width = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH);
- image->repeat = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT);
+ image->slice = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE);
+ image->width = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH);
+ image->repeat = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT);
return TRUE;
}
diff --git a/gtk/gtkborderimageprivate.h b/gtk/gtkborderimageprivate.h
index 682e6e8..c82fe82 100644
--- a/gtk/gtkborderimageprivate.h
+++ b/gtk/gtkborderimageprivate.h
@@ -25,7 +25,6 @@
#include "gtkborder.h"
#include "gtkcssimageprivate.h"
#include "gtkcssvalueprivate.h"
-#include "gtkthemingengine.h"
G_BEGIN_DECLS
@@ -40,7 +39,7 @@ struct _GtkBorderImage {
};
gboolean _gtk_border_image_init (GtkBorderImage *image,
- GtkThemingEngine *engine);
+ GtkStyleContext *context);
void _gtk_border_image_render (GtkBorderImage *image,
const double border_width[4],
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index bdb10d2..337a61c 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1766,7 +1766,7 @@ render_frame_internal (GtkThemingEngine *engine,
gtk_theming_engine_hide_border_sides (border_width, border_style, hidden_side);
- if (_gtk_border_image_init (&border_image, engine))
+ if (_gtk_border_image_init (&border_image, engine->priv->context))
_gtk_border_image_render (&border_image, border_width, cr, x, y, width, height);
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]