[gtk+/wip/actor: 15/25] xxx: cssbox
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/actor: 15/25] xxx: cssbox
- Date: Fri, 21 Dec 2012 22:53:08 +0000 (UTC)
commit b1163bc8c4d0cc59c0a2addc220b0d8c7fd1eb20
Author: Benjamin Otte <otte redhat com>
Date: Sun Dec 16 16:47:53 2012 +0100
xxx: cssbox
gtk/actors/gtkcssbox.c | 167 +++++++++++++++++++++++++++++++++++++----
gtk/actors/gtkcssboxprivate.h | 3 +
2 files changed, 154 insertions(+), 16 deletions(-)
---
diff --git a/gtk/actors/gtkcssbox.c b/gtk/actors/gtkcssbox.c
index 5d574fb..639a2c7 100644
--- a/gtk/actors/gtkcssbox.c
+++ b/gtk/actors/gtkcssbox.c
@@ -26,6 +26,7 @@
#include "gtkcsstypesprivate.h"
#include "gtkdebug.h"
#include "gtkintl.h"
+#include "gtklayoutmanagerprivate.h"
#include "gtkprivate.h"
#include "gtkstylecontext.h"
#include "gtkstylecontextprivate.h"
@@ -43,6 +44,8 @@ G_STATIC_ASSERT((GTK_STATE_FLAGS_PROPAGATE_TO_PARENT & GTK_STATE_FLAGS_PROPAGATE
struct _GtkCssBoxPrivate {
GtkStateFlags state;
+
+ char * id;
};
enum
@@ -51,6 +54,7 @@ enum
PROP_EFFECTIVE_STATE,
PROP_STATE,
+ PROP_ID,
PROP_LAST
};
@@ -136,6 +140,17 @@ 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_free (priv->id);
+
+ 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,
@@ -149,6 +164,10 @@ gtk_css_box_set_property (GObject *object,
_gtk_css_box_set_state (css_box, g_value_get_enum (value));
break;
+ case PROP_ID:
+ _gtk_css_box_set_id (css_box, g_value_get_string (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -173,6 +192,10 @@ gtk_css_box_get_property (GObject *object,
g_value_set_enum (value, _gtk_css_box_get_state (css_box));
break;
+ case PROP_ID:
+ g_value_set_string (value, _gtk_css_box_get_id (css_box));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -240,7 +263,7 @@ gtk_css_box_real_map (GtkActor *self)
static void
gtk_css_box_real_unmap (GtkActor *self)
{
- GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->map (self);
+ GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->unmap (self);
_gtk_style_context_update_animating (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)));
}
@@ -317,31 +340,51 @@ gtk_css_box_get_edge (GtkCssBox *self,
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);
+ 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);
border_style = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, properties[side].border_style));
if (border_style != GTK_BORDER_STYLE_NONE && border_style != GTK_BORDER_STYLE_HIDDEN)
- result = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, properties[side].border), 100);
-
- if (result < 0.0)
- return 0.0;
+ result += _gtk_css_number_value_get (_gtk_style_context_peek_property (context, properties[side].border), 100);
return result;
}
static void
+adjust_size_for_css (GtkCssBox *self,
+ GtkOrientation orientation,
+ gfloat *min_size_p,
+ gfloat *nat_size_p)
+{
+ GtkStyleContext *context;
+ gfloat min_css, nat_css;
+
+ context = _gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self));
+
+ min_css = _gtk_css_number_value_get (
+ _gtk_style_context_peek_property (context,
+ orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_CSS_PROPERTY_MIN_WIDTH
+ : GTK_CSS_PROPERTY_MIN_HEIGHT), 0);
+ nat_css = _gtk_css_number_value_get (
+ _gtk_style_context_peek_property (context,
+ orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_CSS_PROPERTY_MAX_WIDTH
+ : GTK_CSS_PROPERTY_MAX_HEIGHT), 0);
+
+ *min_size_p = MAX (min_css, *min_size_p);
+ *nat_size_p = MIN (nat_css, *nat_size_p);
+ *nat_size_p = MAX (*min_size_p, *nat_size_p);
+}
+
+static void
gtk_css_box_real_get_preferred_size (GtkActor *self,
GtkOrientation orientation,
gfloat for_size,
gfloat *min_size_p,
- gfloat *natural_size_p)
+ gfloat *nat_size_p)
{
GtkCssBox *box = GTK_CSS_BOX (self);
float extra_size;
- *min_size_p = 0;
- *natural_size_p = 0;
if (for_size >= 0)
{
if (orientation == GTK_ORIENTATION_VERTICAL)
@@ -352,33 +395,79 @@ gtk_css_box_real_get_preferred_size (GtkActor *self,
for_size = MAX (0, for_size - extra_size);
}
+ GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->get_preferred_size (self, orientation, for_size, min_size_p, nat_size_p);
+
+ adjust_size_for_css (box, orientation, min_size_p, nat_size_p);
+
if (orientation == GTK_ORIENTATION_HORIZONTAL)
extra_size = gtk_css_box_get_edge (box, GTK_CSS_LEFT) + gtk_css_box_get_edge (box, GTK_CSS_RIGHT);
else
extra_size = gtk_css_box_get_edge (box, GTK_CSS_TOP) + gtk_css_box_get_edge (box, GTK_CSS_BOTTOM);
*min_size_p = MAX (0, *min_size_p + extra_size);
- *natural_size_p = MAX (0, *natural_size_p + extra_size);
+ *nat_size_p = MAX (0, *nat_size_p + extra_size);
+}
+
+static void
+gtk_css_box_real_allocate (GtkActor *actor,
+ gfloat width,
+ gfloat height)
+{
+ GtkCssBox *self = GTK_CSS_BOX (actor);
+ GtkLayoutManager *layout_manager;
+
+ layout_manager = _gtk_actor_get_layout_manager (actor);
+
+ if (layout_manager)
+ {
+ cairo_matrix_t transform;
+ double top, left, bottom, right;
+
+ top = gtk_css_box_get_edge (self, GTK_CSS_TOP);
+ left = gtk_css_box_get_edge (self, GTK_CSS_LEFT);
+ bottom = gtk_css_box_get_edge (self, GTK_CSS_BOTTOM);
+ right = gtk_css_box_get_edge (self, GTK_CSS_RIGHT);
+
+ cairo_matrix_init_translate (&transform, left, top);
+
+ _gtk_layout_manager_allocate (layout_manager,
+ &transform,
+ width - left - right,
+ height - top - bottom);
+ }
+
+ GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->allocate (actor, width, height);
}
static void
gtk_css_box_real_draw (GtkActor *actor,
cairo_t *cr)
{
+ GtkCssBox *self = GTK_CSS_BOX (actor);
GtkStyleContext *context;
+ double width, height;
+ double top, left, bottom, right;
context = _gtk_css_actor_get_style_context (GTK_CSS_ACTOR (actor));
+ top = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_MARGIN_TOP), 100);
+ right = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_MARGIN_RIGHT), 100);
+ bottom = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_MARGIN_BOTTOM), 100);
+ left = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_MARGIN_LEFT), 100);
+ width = _gtk_actor_get_width (actor) - left - right;
+ height = _gtk_actor_get_height (actor) - bottom - top;
gtk_render_background (context,
cr,
- 0, 0,
- _gtk_actor_get_width (actor),
- _gtk_actor_get_height (actor));
+ left, top,
+ width, height);
gtk_render_frame (context,
cr,
- 0, 0,
- _gtk_actor_get_width (actor),
- _gtk_actor_get_height (actor));
+ left, top,
+ width, height);
+
+ cairo_translate (cr,
+ gtk_css_box_get_edge (self, GTK_CSS_LEFT),
+ gtk_css_box_get_edge (self, GTK_CSS_TOP));
GTK_ACTOR_CLASS (_gtk_css_box_parent_class)->draw (actor, cr);
}
@@ -389,6 +478,7 @@ _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;
@@ -399,6 +489,7 @@ _gtk_css_box_class_init (GtkCssBoxClass *klass)
actor_class->draw = gtk_css_box_real_draw;
actor_class->parent_set = gtk_css_box_real_parent_set;
actor_class->get_preferred_size = gtk_css_box_real_get_preferred_size;
+ actor_class->allocate = gtk_css_box_real_allocate;
/**
* GtkCssBox:state:
@@ -431,6 +522,22 @@ _gtk_css_box_class_init (GtkCssBoxClass *klass)
0,
GTK_PARAM_READWRITE);
+ /**
+ * GtkCssBox:id:
+ *
+ * The ID given to this box or %NULL if the box does not have an ID. This is the
+ * default.
+ *
+ * The ID is used for matching in CSS and is supposed to be unique for an actor tree.
+ * Currently this is not enforced, but it might be in the future.
+ */
+ obj_props[PROP_ID] =
+ g_param_spec_string ("id",
+ P_("ID"),
+ P_("ID given to this actor"),
+ NULL,
+ GTK_PARAM_READWRITE);
+
g_type_class_add_private (klass, sizeof (GtkCssBoxPrivate));
}
@@ -524,3 +631,31 @@ _gtk_css_box_has_class (GtkCssBox *self,
return gtk_style_context_has_class (_gtk_css_actor_get_style_context (GTK_CSS_ACTOR (self)), class_name);
}
+
+void
+_gtk_css_box_set_id (GtkCssBox *self,
+ const char *id)
+{
+ GtkCssBoxPrivate *priv;
+
+ g_return_if_fail (GTK_IS_CSS_BOX (self));
+
+ priv = self->priv;
+
+ if (g_strcmp0 (priv->id, id) == 0)
+ return;
+
+ g_free (priv->id);
+ priv->id = g_strdup (id);
+
+ gtk_css_box_queue_restyle (self, GTK_CSS_CHANGE_NAME);
+ g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ID]);
+}
+
+const char *
+_gtk_css_box_get_id (GtkCssBox *self)
+{
+ g_return_val_if_fail (GTK_IS_CSS_BOX (self), NULL);
+
+ return self->priv->id;
+}
diff --git a/gtk/actors/gtkcssboxprivate.h b/gtk/actors/gtkcssboxprivate.h
index 06b76cc..ad4b803 100644
--- a/gtk/actors/gtkcssboxprivate.h
+++ b/gtk/actors/gtkcssboxprivate.h
@@ -57,6 +57,9 @@ void _gtk_css_box_set_state
GtkStateFlags _gtk_css_box_get_state (GtkCssBox *self);
GtkStateFlags _gtk_css_box_get_effective_state (GtkCssBox *self);
+void _gtk_css_box_set_id (GtkCssBox *self,
+ const char *id);
+const char * _gtk_css_box_get_id (GtkCssBox *self);
void _gtk_css_box_add_class (GtkCssBox *self,
const gchar *class_name);
void _gtk_css_box_remove_class (GtkCssBox *self,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
