[gtk+/wip/actor: 8/25] actor: Add GtkCssActor
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/actor: 8/25] actor: Add GtkCssActor
- Date: Fri, 21 Dec 2012 22:52:33 +0000 (UTC)
commit 871e79744515e135f7a99c030de4ccc0c755d2c5
Author: Benjamin Otte <otte redhat com>
Date: Tue Dec 11 15:19:06 2012 +0100
actor: Add GtkCssActor
GtkCssActor is an actor maintaining a reference to a style context. It
is not owning the style context though.
The actor owning a style context is GtkCssBox, which is now a subclass
of GtkCssActor.
gtk/actors/Makefile.am | 2 +
gtk/actors/gtkcssactor.c | 228 +++++++++++++++++++++++++++++++++++++++
gtk/actors/gtkcssactorprivate.h | 59 ++++++++++
gtk/actors/gtkcssbox.c | 85 +++++----------
gtk/actors/gtkcssboxprivate.h | 6 +-
5 files changed, 321 insertions(+), 59 deletions(-)
---
diff --git a/gtk/actors/Makefile.am b/gtk/actors/Makefile.am
index 370930f..2c56221 100644
--- a/gtk/actors/Makefile.am
+++ b/gtk/actors/Makefile.am
@@ -5,12 +5,14 @@ noinst_LTLIBRARIES = libgtkactors.la
gtkactors_c_sources = \
gtkactor.c \
gtkbinlayout.c \
+ gtkcssactor.c \
gtkcssbox.c \
gtklayoutmanager.c
gtkactors_private_h_sources = \
gtkactorprivate.h \
gtkbinlayoutprivate.h \
+ gtkcssactorprivate.h \
gtkcssboxprivate.h \
gtklayoutmanagerprivate.h
diff --git a/gtk/actors/gtkcssactor.c b/gtk/actors/gtkcssactor.c
new file mode 100644
index 0000000..b231932
--- /dev/null
+++ b/gtk/actors/gtkcssactor.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright  2012 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte gnome org>
+ */
+
+#include "config.h"
+
+#include "gtkcssactorprivate.h"
+
+#include "gtkcssboxprivate.h"
+#include "gtkdebug.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkstylecontext.h"
+#include "gtktypebuiltins.h"
+
+struct _GtkCssActorPrivate {
+ GtkStyleContext *context;
+};
+
+enum
+{
+ PROP_0,
+
+ PROP_STYLE_CONTEXT,
+
+ PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
+G_DEFINE_TYPE (GtkCssActor, _gtk_css_actor, GTK_TYPE_ACTOR)
+
+static gboolean
+gtk_css_actor_owns_context (GtkCssActor *actor)
+{
+ return GTK_IS_CSS_BOX (actor);
+}
+
+static void
+gtk_css_actor_finalize (GObject *object)
+{
+ GtkCssActor *self = GTK_CSS_ACTOR (object);
+ GtkCssActorPrivate *priv = self->priv;
+
+ if (priv->context)
+ {
+ g_object_unref (priv->context);
+ priv->context = NULL;
+ }
+
+ G_OBJECT_CLASS (_gtk_css_actor_parent_class)->finalize (object);
+}
+
+static void
+gtk_css_actor_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ //GtkCssActor *css_actor = GTK_CSS_ACTOR (object);
+
+ switch (prop_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_css_actor_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkCssActor *css_actor = GTK_CSS_ACTOR (object);
+
+ switch (prop_id)
+ {
+ case PROP_STYLE_CONTEXT:
+ g_value_set_object (value, _gtk_css_actor_get_style_context (css_actor));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_css_actor_set_style_context (GtkCssActor *self,
+ GtkStyleContext *context)
+{
+ GtkCssActorPrivate *priv;
+ GtkActor *iter;
+
+ g_return_if_fail (GTK_IS_CSS_ACTOR (self));
+ g_return_if_fail (context == NULL || GTK_IS_STYLE_CONTEXT (context));
+
+ /* XXX: Use a default context for NULL? */
+
+ priv = self->priv;
+
+ if (priv->context == context)
+ return;
+
+ if (priv->context)
+ g_object_unref (priv->context);
+
+ if (context)
+ g_object_ref (priv->context);
+
+ priv->context = context;
+
+ for (iter = _gtk_actor_get_first_child (GTK_ACTOR (self));
+ iter != NULL;
+ iter = _gtk_actor_get_next_sibling (iter))
+ {
+ GtkCssActor *css_actor;
+
+ if (!GTK_IS_CSS_ACTOR (iter))
+ continue;
+
+ css_actor = GTK_CSS_ACTOR (iter);
+ if (gtk_css_actor_owns_context (css_actor))
+ continue;
+
+ gtk_css_actor_set_style_context (css_actor, context);
+ }
+
+ g_object_notify (G_OBJECT (self), "style-context");
+}
+static void
+gtk_css_actor_real_parent_set (GtkActor *actor,
+ GtkActor *old_parent)
+{
+ GtkCssActor *self = GTK_CSS_ACTOR (actor);
+ GtkActor *parent;
+
+ parent = _gtk_actor_get_parent (actor);
+
+ if (parent != NULL)
+ {
+ g_warn_if_fail (GTK_IS_CSS_ACTOR (parent));
+ }
+
+ GTK_ACTOR_CLASS (_gtk_css_actor_parent_class)->parent_set (actor, old_parent);
+
+ if (!gtk_css_actor_owns_context (self))
+ {
+ if (parent)
+ gtk_css_actor_set_style_context (self, _gtk_css_actor_get_style_context (GTK_CSS_ACTOR (parent)));
+ else
+ gtk_css_actor_set_style_context (self, NULL);
+ }
+}
+
+static void
+_gtk_css_actor_class_init (GtkCssActorClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkActorClass *actor_class = GTK_ACTOR_CLASS (klass);
+
+ object_class->finalize = gtk_css_actor_finalize;
+ object_class->set_property = gtk_css_actor_set_property;
+ object_class->get_property = gtk_css_actor_get_property;
+
+ actor_class->parent_set = gtk_css_actor_real_parent_set;
+
+ /**
+ * GtkCssActor:style-context:
+ *
+ * The style context in use by the actor.
+ *
+ * FIXME: Do we want to replace this with a GtkCssComputedValues?
+ */
+ obj_props[PROP_STYLE_CONTEXT] =
+ g_param_spec_object ("style-context",
+ P_("Style Context"),
+ P_("Style context used by this actor"),
+ GTK_TYPE_STYLE_CONTEXT,
+ GTK_PARAM_READABLE);
+
+ g_type_class_add_private (klass, sizeof (GtkCssActorPrivate));
+}
+
+static void
+_gtk_css_actor_init (GtkCssActor *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ GTK_TYPE_CSS_ACTOR,
+ GtkCssActorPrivate);
+}
+
+GtkStyleContext *
+_gtk_css_actor_get_style_context (GtkCssActor *actor)
+{
+ g_return_val_if_fail (GTK_IS_CSS_ACTOR (actor), NULL);
+
+ return actor->priv->context;
+}
+
+void
+_gtk_css_actor_init_box (GtkCssActor *self)
+{
+ GtkActor *actor = GTK_ACTOR (self);
+ GtkCssActorPrivate *priv = self->priv;
+
+ priv->context = gtk_style_context_new ();
+ gtk_style_context_set_screen (priv->context, _gtk_actor_get_screen (actor));
+ //_gtk_style_context_set_actor (priv->context, actor);
+}
+
diff --git a/gtk/actors/gtkcssactorprivate.h b/gtk/actors/gtkcssactorprivate.h
new file mode 100644
index 0000000..cae42bc
--- /dev/null
+++ b/gtk/actors/gtkcssactorprivate.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright  2012 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte gnome org>
+ */
+
+#ifndef __GTK_CSS_ACTOR_PRIVATE_H__
+#define __GTK_CSS_ACTOR_PRIVATE_H__
+
+#include <gtk/actors/gtkactorprivate.h>
+#include <gtk/gtkstylecontext.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_CSS_ACTOR (_gtk_css_actor_get_type ())
+#define GTK_CSS_ACTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_CSS_ACTOR, GtkCssActor))
+#define GTK_CSS_ACTOR_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_CSS_ACTOR, GtkCssActorClass))
+#define GTK_IS_CSS_ACTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_CSS_ACTOR))
+#define GTK_IS_CSS_ACTOR_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_CSS_ACTOR))
+#define GTK_CSS_ACTOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CSS_ACTOR, GtkCssActorClass))
+
+typedef struct _GtkCssActor GtkCssActor;
+typedef struct _GtkCssActorPrivate GtkCssActorPrivate;
+typedef struct _GtkCssActorClass GtkCssActorClass;
+typedef struct _GtkCssActorIter GtkCssActorIter;
+
+struct _GtkCssActor
+{
+ GtkActor parent;
+
+ GtkCssActorPrivate *priv;
+};
+
+struct _GtkCssActorClass
+{
+ GtkActorClass parent_class;
+};
+
+GType _gtk_css_actor_get_type (void) G_GNUC_CONST;
+
+GtkStyleContext * _gtk_css_actor_get_style_context (GtkCssActor *actor);
+void _gtk_css_actor_init_box (GtkCssActor *actor);
+
+G_END_DECLS
+
+#endif /* __GTK_CSS_ACTOR_PRIVATE_H__ */
diff --git a/gtk/actors/gtkcssbox.c b/gtk/actors/gtkcssbox.c
index 25e583f..5d574fb 100644
--- a/gtk/actors/gtkcssbox.c
+++ b/gtk/actors/gtkcssbox.c
@@ -42,10 +42,7 @@ G_STATIC_ASSERT((GTK_STATE_FLAGS_PROPAGATE_TO_PARENT & GTK_STATE_FLAGS_PROPAGATE
#define GTK_STATE_FLAGS_NO_PROPAGATE (~(GTK_STATE_FLAGS_PROPAGATE_TO_PARENT | GTK_STATE_FLAGS_PROPAGATE_TO_CHILDREN))
struct _GtkCssBoxPrivate {
- GtkStyleContext *context;
-
GtkStateFlags state;
-
};
enum
@@ -60,13 +57,13 @@ enum
static GParamSpec *obj_props[PROP_LAST];
-G_DEFINE_TYPE (GtkCssBox, _gtk_css_box, GTK_TYPE_ACTOR)
+G_DEFINE_TYPE (GtkCssBox, _gtk_css_box, GTK_TYPE_CSS_ACTOR)
static void
gtk_css_box_set_effective_state (GtkCssBox *box,
GtkStateFlags state)
{
- gtk_style_context_set_state (box->priv->context, state);
+ gtk_style_context_set_state (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (box)), state);
g_object_notify_by_pspec (G_OBJECT (box), obj_props[PROP_EFFECTIVE_STATE]);
}
@@ -75,7 +72,7 @@ _gtk_css_box_get_effective_state (GtkCssBox *self)
{
g_return_val_if_fail (GTK_IS_CSS_BOX (self), 0);
- return gtk_style_context_get_state (self->priv->context);
+ return gtk_style_context_get_state (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)));
}
static void
@@ -139,18 +136,6 @@ gtk_css_box_update_state_on_children (GtkCssBox *box,
}
static void
-gtk_css_box_finalize (GObject *object)
-{
- GtkCssBox *self = GTK_CSS_BOX (object);
- GtkCssBoxPrivate *priv = self->priv;
-
- g_object_unref (priv->context);
- priv->context = NULL;
-
- G_OBJECT_CLASS (_gtk_css_box_parent_class)->finalize (object);
-}
-
-static void
gtk_css_box_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -198,7 +183,7 @@ static void
gtk_css_box_queue_restyle (GtkCssBox *self,
GtkCssChange change)
{
- _gtk_style_context_queue_invalidate (self->priv->context, change);
+ _gtk_style_context_queue_invalidate (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)), change);
}
static void
@@ -247,23 +232,17 @@ gtk_css_box_real_hide (GtkActor *self)
static void
gtk_css_box_real_map (GtkActor *self)
{
- GtkCssBox *box = GTK_CSS_BOX (self);
- GtkCssBoxPrivate *priv = box->priv;
-
GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->map (self);
- _gtk_style_context_update_animating (priv->context);
+ _gtk_style_context_update_animating (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)));
}
static void
gtk_css_box_real_unmap (GtkActor *self)
{
- GtkCssBox *box = GTK_CSS_BOX (self);
- GtkCssBoxPrivate *priv = box->priv;
-
GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->map (self);
- _gtk_style_context_update_animating (priv->context);
+ _gtk_style_context_update_animating (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)));
}
static void
@@ -271,7 +250,6 @@ gtk_css_box_real_parent_set (GtkActor *self,
GtkActor *old_parent)
{
GtkCssBox *box = GTK_CSS_BOX (self);
- GtkCssBoxPrivate *priv = box->priv;
GtkActor *parent;
parent = _gtk_actor_get_parent (self);
@@ -283,7 +261,8 @@ gtk_css_box_real_parent_set (GtkActor *self,
GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->parent_set (self, old_parent);
- gtk_style_context_set_parent (priv->context, parent ? GTK_CSS_BOX (parent)->priv->context : NULL);
+ gtk_style_context_set_parent (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)),
+ parent ? _gtk_css_actor_get_style_context (GTK_CSS_ACTOR (parent)) : NULL);
if (parent)
{
@@ -306,7 +285,7 @@ gtk_css_box_real_parent_set (GtkActor *self,
}
static double
-gtk_css_box_get_edge (GtkCssBox *box,
+gtk_css_box_get_edge (GtkCssBox *self,
GtkCssSide side)
{
const struct {
@@ -336,7 +315,7 @@ gtk_css_box_get_edge (GtkCssBox *box,
GtkBorderStyle border_style;
double result;
- context = box->priv->context;
+ context = _gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self));
result = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, properties[side].margin), 100);
+ _gtk_css_number_value_get (_gtk_style_context_peek_property (context, properties[side].padding), 100);
@@ -383,24 +362,25 @@ gtk_css_box_real_get_preferred_size (GtkActor *self,
}
static void
-gtk_css_box_real_draw (GtkActor *self,
+gtk_css_box_real_draw (GtkActor *actor,
cairo_t *cr)
{
- GtkCssBox *box = GTK_CSS_BOX (self);
- GtkCssBoxPrivate *priv = box->priv;
+ GtkStyleContext *context;
+
+ context = _gtk_css_actor_get_style_context (GTK_CSS_ACTOR (actor));
- gtk_render_background (priv->context,
+ gtk_render_background (context,
cr,
0, 0,
- _gtk_actor_get_width (self),
- _gtk_actor_get_height (self));
- gtk_render_frame (priv->context,
+ _gtk_actor_get_width (actor),
+ _gtk_actor_get_height (actor));
+ gtk_render_frame (context,
cr,
0, 0,
- _gtk_actor_get_width (self),
- _gtk_actor_get_height (self));
+ _gtk_actor_get_width (actor),
+ _gtk_actor_get_height (actor));
- GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->draw (self, cr);
+ GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->draw (actor, cr);
}
static void
@@ -409,7 +389,6 @@ _gtk_css_box_class_init (GtkCssBoxClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkActorClass *actor_class = GTK_ACTOR_CLASS (klass);
- object_class->finalize = gtk_css_box_finalize;
object_class->set_property = gtk_css_box_set_property;
object_class->get_property = gtk_css_box_get_property;
@@ -456,19 +435,13 @@ _gtk_css_box_class_init (GtkCssBoxClass *klass)
}
static void
-_gtk_css_box_init (GtkCssBox *box)
+_gtk_css_box_init (GtkCssBox *self)
{
- GtkCssBoxPrivate *priv;
- GtkActor *actor = GTK_ACTOR (box);
-
- box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box,
- GTK_TYPE_CSS_BOX,
- GtkCssBoxPrivate);
- priv = box->priv;
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ GTK_TYPE_CSS_BOX,
+ GtkCssBoxPrivate);
- priv->context = gtk_style_context_new ();
- gtk_style_context_set_screen (priv->context, _gtk_actor_get_screen (actor));
- //_gtk_style_context_set_actor (priv->context, actor);
+ _gtk_css_actor_init_box (GTK_CSS_ACTOR (self));
}
GtkActor *
@@ -529,7 +502,7 @@ _gtk_css_box_add_class (GtkCssBox *self,
g_return_if_fail (GTK_IS_CSS_BOX (self));
g_return_if_fail (class_name != NULL);
- gtk_style_context_add_class (self->priv->context, class_name);
+ gtk_style_context_add_class (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)), class_name);
}
void
@@ -539,7 +512,7 @@ _gtk_css_box_remove_class (GtkCssBox *self,
g_return_if_fail (GTK_IS_CSS_BOX (self));
g_return_if_fail (class_name != NULL);
- gtk_style_context_remove_class (self->priv->context, class_name);
+ gtk_style_context_remove_class (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)), class_name);
}
gboolean
@@ -549,5 +522,5 @@ _gtk_css_box_has_class (GtkCssBox *self,
g_return_val_if_fail (GTK_IS_CSS_BOX (self), FALSE);
g_return_val_if_fail (class_name != NULL, FALSE);
- return gtk_style_context_has_class (self->priv->context, class_name);
+ return gtk_style_context_has_class (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)), class_name);
}
diff --git a/gtk/actors/gtkcssboxprivate.h b/gtk/actors/gtkcssboxprivate.h
index ddc5a81..06b76cc 100644
--- a/gtk/actors/gtkcssboxprivate.h
+++ b/gtk/actors/gtkcssboxprivate.h
@@ -20,7 +20,7 @@
#ifndef __GTK_CSS_BOX_PRIVATE_H__
#define __GTK_CSS_BOX_PRIVATE_H__
-#include <gtk/actors/gtkactorprivate.h>
+#include <gtk/actors/gtkcssactorprivate.h>
G_BEGIN_DECLS
@@ -38,14 +38,14 @@ typedef struct _GtkCssBoxIter GtkCssBoxIter;
struct _GtkCssBox
{
- GtkActor parent;
+ GtkCssActor parent;
GtkCssBoxPrivate *priv;
};
struct _GtkCssBoxClass
{
- GtkActorClass parent_class;
+ GtkCssActorClass parent_class;
};
GType _gtk_css_box_get_type (void) G_GNUC_CONST;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
