brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-11-19 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-label.[ch]: Fix ClutterLabel size allocation when
	no bounding box has been provided, and store the box set by the
	user so that it can be reused when recomputing the layout. (#600)

	(clutter_label_class_init),
	(clutter_label_init): Set the :wrap property default to FALSE.
	
	* clutter/clutter-units.h: Add ClutterUnit-to-PangoUnit conversion
	macro.

	* tests/test-rotate.c: Fix string.
This commit is contained in:
Emmanuele Bassi 2007-11-19 21:14:16 +00:00
parent 531be399b7
commit caa56dadd4
7 changed files with 571 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2007-11-19 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-label.[ch]: Fix ClutterLabel size allocation when
no bounding box has been provided, and store the box set by the
user so that it can be reused when recomputing the layout. (#600)
(clutter_label_class_init),
(clutter_label_init): Set the :wrap property default to FALSE.
* clutter/clutter-units.h: Add ClutterUnit-to-PangoUnit conversion
macro.
* tests/test-rotate.c: Fix string.
2007-11-19 Emmanuele Bassi <ebassi@openedhand.com> 2007-11-19 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-behaviour-bspline.c: * clutter/clutter-behaviour-bspline.c:

731
clutter/clutter-label.c
View File

@ -27,7 +27,7 @@
* SECTION:clutter-label * SECTION:clutter-label
* @short_description: Actor for displaying text * @short_description: Actor for displaying text
* *
* #ClutterLabel is a #ClutterTexture that displays text. * #ClutterLabel is a #ClutterActor that displays text using Pango.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -66,11 +66,12 @@ enum
PROP_COLOR, PROP_COLOR,
PROP_ATTRIBUTES, PROP_ATTRIBUTES,
PROP_USE_MARKUP, PROP_USE_MARKUP,
PROP_ALIGNMENT, /* FIXME */ PROP_ALIGNMENT,
PROP_WRAP, PROP_WRAP,
PROP_WRAP_MODE, PROP_WRAP_MODE,
PROP_JUSTIFY,
PROP_ELLIPSIZE, PROP_ELLIPSIZE,
PROP_LAYOUT_FLAGS, PROP_LAYOUT_FLAGS
}; };
#define CLUTTER_LABEL_GET_PRIVATE(obj) \ #define CLUTTER_LABEL_GET_PRIVATE(obj) \
@ -79,11 +80,10 @@ enum
struct _ClutterLabelPrivate struct _ClutterLabelPrivate
{ {
PangoContext *context; PangoContext *context;
PangoFontDescription *desc; PangoFontDescription *font_desc;
ClutterColor fgcol; ClutterColor fgcol;
ClutterLayoutFlags layout_flags;
ClutterActorBox allocation; ClutterActorBox allocation;
gchar *text; gchar *text;
@ -99,13 +99,406 @@ struct _ClutterLabelPrivate
guint ellipsize : 3; guint ellipsize : 3;
guint single_line_mode : 1; guint single_line_mode : 1;
guint wrap_mode : 3; guint wrap_mode : 3;
guint justify : 1;
PangoAttrList *attrs; PangoAttrList *attrs;
PangoAttrList *effective_attrs; PangoAttrList *effective_attrs;
PangoLayout *layout; PangoLayout *layout;
gint width_chars; gint width_chars;
gint wrap_width;
}; };
static gint
get_label_char_width (ClutterLabel *label)
{
ClutterLabelPrivate *priv = label->priv;
PangoContext *context;
PangoFontMetrics *metrics;
gint char_width, digit_width, char_pixels, w;
context = pango_layout_get_context (priv->layout);
metrics = pango_context_get_metrics (context, priv->font_desc,
pango_context_get_language (context));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
char_pixels = MAX (char_width, digit_width);
pango_font_metrics_unref (metrics);
if (priv->width_chars < 0)
{
PangoRectangle rect;
pango_layout_set_width (priv->layout, -1);
pango_layout_get_extents (priv->layout, NULL, &rect);
w = char_pixels * 5;
w = MIN (rect.width, w);
}
else
{
/* enforce minimum width for ellipsized labels at ~5 chars */
w = char_pixels * MAX (priv->width_chars, 5);
}
return w;
}
static gint
get_label_wrap_width (ClutterLabel *label)
{
ClutterLabelPrivate *priv = label->priv;
if (priv->wrap_width < 0)
{
if (priv->width_chars > 0)
priv->wrap_width = get_label_char_width (label);
else
{
PangoLayout *tmp;
tmp = pango_layout_new (_context);
pango_layout_set_font_description (tmp, priv->font_desc);
pango_layout_set_text (tmp, "This is a very long string, which "
"should be enough for a wrap width.",
-1);
pango_layout_get_size (tmp, &priv->wrap_width, NULL);
g_object_unref (tmp);
}
}
return priv->wrap_width;
}
static void
clutter_label_ensure_layout (ClutterLabel *label)
{
ClutterLabelPrivate *priv;
gint width;
priv = label->priv;
/* use the last size requested, if any */
width = CLUTTER_UNITS_TO_INT (priv->allocation.x2 - priv->allocation.x1);
if (!priv->layout)
{
priv->layout = pango_layout_new (_context);
if (priv->effective_attrs)
pango_layout_set_attributes (priv->layout, priv->effective_attrs);
pango_layout_set_alignment (priv->layout, priv->alignment);
pango_layout_set_ellipsize (priv->layout, priv->ellipsize);
pango_layout_set_single_paragraph_mode (priv->layout,
priv->single_line_mode);
pango_layout_set_font_description (priv->layout, priv->font_desc);
pango_layout_set_justify (priv->layout, priv->justify);
if (priv->text)
{
if (!priv->use_markup)
pango_layout_set_text (priv->layout, priv->text, -1);
else
pango_layout_set_markup (priv->layout, priv->text, -1);
}
if (priv->ellipsize)
pango_layout_set_width (priv->layout, width > 0 ? width * PANGO_SCALE
: -1);
else if (priv->wrap)
{
pango_layout_set_wrap (priv->layout, priv->wrap_mode);
if (width > 0)
pango_layout_set_width (priv->layout, width * PANGO_SCALE);
else
{
/* this was adapted from the GtkLabel code */
ClutterActor *stage = clutter_stage_get_default ();
gint stage_width = clutter_actor_get_width (stage);
gint longest_paragraph, height, wrap_width;
PangoRectangle logical_rect;
pango_layout_set_width (priv->layout, -1);
pango_layout_get_extents (priv->layout, NULL, &logical_rect);
width = logical_rect.width;
longest_paragraph = width;
wrap_width = get_label_wrap_width (label);
width = MAX (width, wrap_width);
width = MIN (width, PANGO_SCALE * (stage_width + 1) / 2);
pango_layout_set_width (priv->layout, width);
pango_layout_get_extents (priv->layout, NULL, &logical_rect);
width = logical_rect.width;
height = logical_rect.height;
if (longest_paragraph > 0)
{
gint n_lines, perfect_width;
n_lines = pango_layout_get_line_count (priv->layout);
perfect_width = (longest_paragraph + n_lines - 1) / n_lines;
if (perfect_width < width)
{
pango_layout_set_width (priv->layout, perfect_width);
pango_layout_get_extents (priv->layout, NULL,
&logical_rect);
if (logical_rect.height <= height)
width = logical_rect.width = width;
else
{
gint mid_width = (perfect_width + width) / 2;
if (mid_width > perfect_width)
{
pango_layout_set_width (priv->layout, mid_width);
pango_layout_get_extents (priv->layout, NULL,
&logical_rect);
if (logical_rect.height <= height);
width = logical_rect.width;
}
}
}
}
pango_layout_set_width (priv->layout, width);
}
}
else
pango_layout_set_width (priv->layout, -1);
}
CLUTTER_NOTE (ACTOR, "Label width set to %d pixels", width);
}
static void
clutter_label_clear_layout (ClutterLabel *label)
{
if (label->priv->layout)
{
g_object_unref (label->priv->layout);
label->priv->layout = NULL;
}
}
static void
clutter_label_paint (ClutterActor *self)
{
ClutterLabel *label = CLUTTER_LABEL (self);
ClutterLabelPrivate *priv = label->priv;
if (priv->font_desc == NULL || priv->text == NULL)
{
CLUTTER_NOTE (ACTOR, "layout: %p, desc: %p, text %p",
priv->layout,
priv->font_desc ? priv->font_desc : 0x0,
priv->text ? priv->text : 0x0);
return;
}
CLUTTER_NOTE (PAINT, "painting label (text:`%s')", priv->text);
clutter_label_ensure_layout (label);
priv->fgcol.alpha = clutter_actor_get_opacity (self);
pango_clutter_render_layout (priv->layout, 0, 0, &priv->fgcol, 0);
}
static void
clutter_label_query_coords (ClutterActor *self,
ClutterActorBox *box)
{
ClutterLabel *label = CLUTTER_LABEL(self);
ClutterLabelPrivate *priv;
PangoRectangle logical_rect;
priv = label->priv;
if (priv->wrap)
clutter_label_clear_layout (label);
clutter_label_ensure_layout (label);
pango_layout_get_extents (priv->layout, NULL, &logical_rect);
box->x2 = box->x1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width);
box->y2 = box->y1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.height);
return;
}
static void
clutter_label_request_coords (ClutterActor *self,
ClutterActorBox *box)
{
ClutterLabel *label = CLUTTER_LABEL (self);
ClutterLabelPrivate *priv = label->priv;
if (priv->ellipsize)
{
if (priv->layout)
{
gint width;
PangoRectangle logical;
width = CLUTTER_UNITS_TO_INT (box->x2 - box->x1) * PANGO_SCALE;
pango_layout_set_width (priv->layout, -1);
pango_layout_get_extents (priv->layout, NULL, &logical);
if (logical.width > width)
pango_layout_set_width (priv->layout, width);
}
}
else
clutter_label_clear_layout (label);
priv->allocation = *box;
}
static void
clutter_label_dispose (GObject *object)
{
ClutterLabel *self = CLUTTER_LABEL(object);
ClutterLabelPrivate *priv;
priv = self->priv;
if (priv->layout)
{
g_object_unref (priv->layout);
priv->layout = NULL;
}
if (priv->context)
{
g_object_unref (priv->context);
priv->context = NULL;
}
G_OBJECT_CLASS (clutter_label_parent_class)->dispose (object);
}
static void
clutter_label_finalize (GObject *object)
{
ClutterLabel *self = CLUTTER_LABEL(object);
ClutterLabelPrivate *priv;
priv = self->priv;
if (priv->font_desc)
pango_font_description_free (priv->font_desc);
g_free (priv->text);
g_free (priv->font_name);
G_OBJECT_CLASS (clutter_label_parent_class)->finalize (object);
}
static ClutterLayoutFlags
clutter_label_get_layout_flags (ClutterLayout *layout)
{
ClutterLayoutFlags flags;
ClutterFixed angle;
flags = CLUTTER_LAYOUT_NATURAL;
angle = clutter_actor_get_rotationx (CLUTTER_ACTOR (layout),
CLUTTER_Z_AXIS,
NULL, NULL, NULL);
if (angle == 0 || angle == CLUTTER_INT_TO_FIXED (180))
flags |= CLUTTER_LAYOUT_HEIGHT_FOR_WIDTH;
else if (angle == CLUTTER_INT_TO_FIXED (90) || angle == CLUTTER_INT_TO_FIXED (270))
flags |= CLUTTER_LAYOUT_WIDTH_FOR_HEIGHT;
return flags;
}
static void
clutter_label_width_for_height (ClutterLayout *layout,
ClutterUnit *width,
ClutterUnit height)
{
ClutterLabel *label = CLUTTER_LABEL (layout);
PangoLayout *tmp;
gint layout_height;
clutter_label_ensure_layout (label);
tmp = pango_layout_copy (label->priv->layout);
pango_layout_set_width (tmp, CLUTTER_UNITS_TO_PANGO_UNIT (height));
pango_layout_get_pixel_size (tmp, NULL, &layout_height);
if (width)
*width = CLUTTER_UNITS_FROM_INT (layout_height);
g_object_unref (tmp);
}
static void
clutter_label_height_for_width (ClutterLayout *layout,
ClutterUnit width,
ClutterUnit *height)
{
ClutterLabel *label = CLUTTER_LABEL (layout);
PangoLayout *tmp;
gint layout_height;
clutter_label_ensure_layout (label);
tmp = pango_layout_copy (label->priv->layout);
pango_layout_set_width (tmp, CLUTTER_UNITS_TO_PANGO_UNIT (width));
pango_layout_get_pixel_size (tmp, NULL, &layout_height);
if (height)
*height = CLUTTER_UNITS_FROM_INT (layout_height);
g_object_unref (tmp);
}
static void
clutter_label_natural_request (ClutterLayout *layout,
ClutterUnit *width,
ClutterUnit *height)
{
ClutterLabel *label = CLUTTER_LABEL (layout);
PangoLayout *tmp;
PangoRectangle logical_rect = { 0, };
clutter_label_ensure_layout (label);
tmp = pango_layout_copy (label->priv->layout);
pango_layout_set_width (tmp, -1);
pango_layout_set_ellipsize (tmp, PANGO_ELLIPSIZE_NONE);
pango_layout_get_extents (tmp, NULL, &logical_rect);
if (width)
*width = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width);
if (height)
*height = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.height);
g_object_unref (tmp);
}
static void
clutter_layout_iface_init (ClutterLayoutIface *iface)
{
iface->get_layout_flags = clutter_label_get_layout_flags;
iface->height_for_width = clutter_label_height_for_width;
iface->width_for_height = clutter_label_width_for_height;
iface->natural_request = clutter_label_natural_request;
}
static void static void
clutter_label_set_property (GObject *object, clutter_label_set_property (GObject *object,
@ -142,6 +535,9 @@ clutter_label_set_property (GObject *object,
case PROP_WRAP: case PROP_WRAP:
clutter_label_set_line_wrap (label, g_value_get_boolean (value)); clutter_label_set_line_wrap (label, g_value_get_boolean (value));
break; break;
case PROP_JUSTIFY:
clutter_label_set_justify (label, g_value_get_boolean (value));
break;
case PROP_WRAP_MODE: case PROP_WRAP_MODE:
clutter_label_set_line_wrap_mode (label, g_value_get_enum (value)); clutter_label_set_line_wrap_mode (label, g_value_get_enum (value));
break; break;
@ -188,6 +584,9 @@ clutter_label_get_property (GObject *object,
case PROP_USE_MARKUP: case PROP_USE_MARKUP:
g_value_set_boolean (value, priv->use_markup); g_value_set_boolean (value, priv->use_markup);
break; break;
case PROP_JUSTIFY:
g_value_set_boolean (value, priv->justify);
break;
case PROP_WRAP: case PROP_WRAP:
g_value_set_boolean (value, priv->wrap); g_value_set_boolean (value, priv->wrap);
break; break;
@ -198,7 +597,8 @@ clutter_label_get_property (GObject *object,
g_value_set_enum (value, priv->ellipsize); g_value_set_enum (value, priv->ellipsize);
break; break;
case PROP_LAYOUT_FLAGS: case PROP_LAYOUT_FLAGS:
g_value_set_flags (value, priv->layout_flags); g_value_set_flags (value,
clutter_label_get_layout_flags (CLUTTER_LAYOUT (label)));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -206,201 +606,6 @@ clutter_label_get_property (GObject *object,
} }
} }
static void
clutter_label_ensure_layout (ClutterLabel *label,
gint width)
{
ClutterLabelPrivate *priv;
priv = label->priv;
if (!priv->layout)
{
priv->layout = pango_layout_new (_context);
if (priv->effective_attrs)
pango_layout_set_attributes (priv->layout, priv->effective_attrs);
pango_layout_set_alignment (priv->layout, priv->alignment);
pango_layout_set_ellipsize (priv->layout, priv->ellipsize);
pango_layout_set_single_paragraph_mode (priv->layout,
priv->single_line_mode);
pango_layout_set_font_description (priv->layout, priv->desc);
if (priv->text)
{
if (!priv->use_markup)
pango_layout_set_text (priv->layout, priv->text, -1);
else
pango_layout_set_markup (priv->layout, priv->text, -1);
}
if (priv->wrap)
pango_layout_set_wrap (priv->layout, priv->wrap_mode);
if ((priv->ellipsize || priv->wrap) && width > 0)
{
pango_layout_set_width (priv->layout, width * PANGO_SCALE);
}
else
pango_layout_set_width (priv->layout, -1);
}
}
static void
clutter_label_clear_layout (ClutterLabel *label)
{
if (label->priv->layout)
{
g_object_unref (label->priv->layout);
label->priv->layout = NULL;
}
}
void
clutter_label_paint (ClutterActor *self)
{
ClutterLabel *label;
ClutterLabelPrivate *priv;
label = CLUTTER_LABEL(self);
priv = label->priv;
if (priv->desc == NULL || priv->text == NULL)
{
CLUTTER_NOTE (ACTOR, "layout: %p , desc: %p, text %p",
priv->layout,
priv->desc,
priv->text);
return;
}
CLUTTER_NOTE (PAINT, "painting label (text:`%s')",
priv->text);
clutter_label_ensure_layout (label, clutter_actor_get_width (self));
priv->fgcol.alpha = clutter_actor_get_opacity(self);
pango_clutter_render_layout (priv->layout, 0, 0, &priv->fgcol, 0);
}
static void
clutter_label_query_coords (ClutterActor *self,
ClutterActorBox *box)
{
ClutterLabel *label = CLUTTER_LABEL(self);
ClutterLabelPrivate *priv;
PangoRectangle logical_rect;
priv = label->priv;
clutter_label_ensure_layout (label, CLUTTER_UNITS_TO_INT (box->x2 - box->x1));
pango_layout_get_extents (priv->layout, NULL, &logical_rect);
box->x2 = box->x1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width);
box->y2 = box->y1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.height);
return;
}
static void
clutter_label_request_coords (ClutterActor *self,
ClutterActorBox *box)
{
ClutterLabel *label = CLUTTER_LABEL (self);
ClutterLabelPrivate *priv = label->priv;
if (priv->ellipsize)
{
if (priv->layout)
{
gint width;
PangoRectangle logical;
width = CLUTTER_UNITS_TO_INT (box->x2 - box->x1) * PANGO_SCALE;
pango_layout_set_width (priv->layout, -1);
pango_layout_get_extents (priv->layout, NULL, &logical);
if (logical.width > width)
pango_layout_set_width (priv->layout, width);
}
}
else
clutter_label_clear_layout (label);
}
static void
clutter_label_dispose (GObject *object)
{
ClutterLabel *self = CLUTTER_LABEL(object);
ClutterLabelPrivate *priv;
priv = self->priv;
if (priv->layout)
{
g_object_unref (priv->layout);
priv->layout = NULL;
}
if (priv->context)
{
g_object_unref (priv->context);
priv->context = NULL;
}
G_OBJECT_CLASS (clutter_label_parent_class)->dispose (object);
}
static void
clutter_label_finalize (GObject *object)
{
ClutterLabel *self = CLUTTER_LABEL(object);
ClutterLabelPrivate *priv;
priv = self->priv;
if (priv->desc)
pango_font_description_free (priv->desc);
g_free (priv->text);
g_free (priv->font_name);
G_OBJECT_CLASS (clutter_label_parent_class)->finalize (object);
}
static ClutterLayoutFlags
clutter_layout_label_get_layout_flags (ClutterLayout *layout)
{
return CLUTTER_LABEL (layout)->priv->layout_flags;
}
static void
clutter_layout_label_height_for_width (ClutterLayout *layout,
ClutterUnit width,
ClutterUnit *height)
{
ClutterLabel *label = CLUTTER_LABEL (layout);
gint layout_height;
clutter_label_ensure_layout (label, CLUTTER_UNITS_TO_INT (width));
pango_layout_get_pixel_size (label->priv->layout, NULL, &layout_height);
if (height)
*height = CLUTTER_UNITS_FROM_INT (layout_height);
}
static void
clutter_layout_iface_init (ClutterLayoutIface *iface)
{
iface->get_layout_flags = clutter_layout_label_get_layout_flags;
iface->height_for_width = clutter_layout_label_height_for_width;
}
static void static void
clutter_label_class_init (ClutterLabelClass *klass) clutter_label_class_init (ClutterLabelClass *klass)
{ {
@ -423,7 +628,6 @@ clutter_label_class_init (ClutterLabelClass *klass)
"Pango font description", "Pango font description",
NULL, NULL,
G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE)); G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_TEXT, (gobject_class, PROP_TEXT,
g_param_spec_string ("text", g_param_spec_string ("text",
@ -431,7 +635,6 @@ clutter_label_class_init (ClutterLabelClass *klass)
"Text to render", "Text to render",
NULL, NULL,
G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE)); G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_COLOR, (gobject_class, PROP_COLOR,
g_param_spec_boxed ("color", g_param_spec_boxed ("color",
@ -439,7 +642,6 @@ clutter_label_class_init (ClutterLabelClass *klass)
"Font Colour", "Font Colour",
CLUTTER_TYPE_COLOR, CLUTTER_TYPE_COLOR,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_ATTRIBUTES, (gobject_class, PROP_ATTRIBUTES,
g_param_spec_boxed ("attributes", g_param_spec_boxed ("attributes",
@ -448,7 +650,6 @@ clutter_label_class_init (ClutterLabelClass *klass)
"text of the label", "text of the label",
PANGO_TYPE_ATTR_LIST, PANGO_TYPE_ATTR_LIST,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_USE_MARKUP, (gobject_class, PROP_USE_MARKUP,
g_param_spec_boolean ("use-markup", g_param_spec_boolean ("use-markup",
@ -457,15 +658,13 @@ clutter_label_class_init (ClutterLabelClass *klass)
"See pango_parse_markup()", "See pango_parse_markup()",
FALSE, FALSE,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_WRAP, (gobject_class, PROP_WRAP,
g_param_spec_boolean ("wrap", g_param_spec_boolean ("wrap",
"Line wrap", "Line wrap",
"If set, wrap lines if the text becomes too wide", "If set, wrap lines if the text becomes too wide",
TRUE, FALSE,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_WRAP_MODE, (gobject_class, PROP_WRAP_MODE,
g_param_spec_enum ("wrap-mode", g_param_spec_enum ("wrap-mode",
@ -474,7 +673,6 @@ clutter_label_class_init (ClutterLabelClass *klass)
PANGO_TYPE_WRAP_MODE, PANGO_TYPE_WRAP_MODE,
PANGO_WRAP_WORD, PANGO_WRAP_WORD,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_ELLIPSIZE, (gobject_class, PROP_ELLIPSIZE,
g_param_spec_enum ( "ellipsize", g_param_spec_enum ( "ellipsize",
@ -485,15 +683,29 @@ clutter_label_class_init (ClutterLabelClass *klass)
PANGO_TYPE_ELLIPSIZE_MODE, PANGO_TYPE_ELLIPSIZE_MODE,
PANGO_ELLIPSIZE_NONE, PANGO_ELLIPSIZE_NONE,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
g_object_class_install_property g_object_class_install_property
(gobject_class, PROP_ALIGNMENT, (gobject_class, PROP_ALIGNMENT,
g_param_spec_enum ( "alignment", g_param_spec_enum ( "alignment",
"Alignment", "Alignment",
"The preferred alignment for the string,", "The preferred alignment for the string",
PANGO_TYPE_ALIGNMENT, PANGO_TYPE_ALIGNMENT,
PANGO_ALIGN_LEFT, PANGO_ALIGN_LEFT,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
/**
* ClutterLabel:justify:
*
* Whether the contents of the label should be justified on both
* margins.
*
* Since: 0.6
*/
g_object_class_install_property (gobject_class,
PROP_JUSTIFY,
g_param_spec_boolean ("justify",
"Justify",
"Whether the contents of the label should be justified",
FALSE,
CLUTTER_PARAM_READWRITE));
g_object_class_override_property (gobject_class, g_object_class_override_property (gobject_class,
PROP_LAYOUT_FLAGS, PROP_LAYOUT_FLAGS,
@ -525,15 +737,19 @@ clutter_label_init (ClutterLabel *self)
} }
priv->alignment = PANGO_ALIGN_LEFT; priv->alignment = PANGO_ALIGN_LEFT;
priv->wrap = TRUE; priv->wrap = FALSE;
priv->wrap_mode = PANGO_WRAP_WORD; priv->wrap_mode = PANGO_WRAP_WORD;
priv->ellipsize = PANGO_ELLIPSIZE_NONE; priv->ellipsize = PANGO_ELLIPSIZE_NONE;
priv->use_underline = FALSE; priv->use_underline = FALSE;
priv->use_markup = FALSE; priv->use_markup = FALSE;
priv->justify = FALSE;
priv->layout = NULL; priv->layout = NULL;
priv->text = NULL; priv->text = NULL;
priv->attrs = NULL; priv->attrs = NULL;
priv->layout_flags = CLUTTER_LAYOUT_HEIGHT_FOR_WIDTH;
priv->width_chars = -1;
priv->wrap_width = -1;
priv->fgcol.red = 0; priv->fgcol.red = 0;
priv->fgcol.green = 0; priv->fgcol.green = 0;
@ -541,7 +757,7 @@ clutter_label_init (ClutterLabel *self)
priv->fgcol.alpha = 255; priv->fgcol.alpha = 255;
priv->font_name = g_strdup (DEFAULT_FONT_NAME); priv->font_name = g_strdup (DEFAULT_FONT_NAME);
priv->desc = pango_font_description_from_string (priv->font_name); priv->font_desc = pango_font_description_from_string (priv->font_name);
CLUTTER_MARK(); CLUTTER_MARK();
} }
@ -559,16 +775,10 @@ ClutterActor*
clutter_label_new_with_text (const gchar *font_name, clutter_label_new_with_text (const gchar *font_name,
const gchar *text) const gchar *text)
{ {
ClutterActor *label; return g_object_new (CLUTTER_TYPE_LABEL,
"font-name", font_name,
CLUTTER_MARK(); "text", text,
NULL);
label = clutter_label_new ();
clutter_label_set_font_name (CLUTTER_LABEL(label), font_name);
clutter_label_set_text (CLUTTER_LABEL(label), text);
return label;
} }
/** /**
@ -587,13 +797,10 @@ clutter_label_new_full (const gchar *font_name,
const gchar *text, const gchar *text,
const ClutterColor *color) const ClutterColor *color)
{ {
/* FIXME: really new_with_text should take color argument... */ return g_object_new (CLUTTER_TYPE_LABEL,
ClutterActor *label; "font-name", font_name,
"text", text,
label = clutter_label_new_with_text (font_name, text); "color", color);
clutter_label_set_color (CLUTTER_LABEL(label), color);
return label;
} }
/** /**
@ -718,16 +925,17 @@ clutter_label_set_font_name (ClutterLabel *label,
g_free (priv->font_name); g_free (priv->font_name);
priv->font_name = g_strdup (font_name); priv->font_name = g_strdup (font_name);
if (priv->desc) if (priv->font_desc)
pango_font_description_free (priv->desc); pango_font_description_free (priv->font_desc);
priv->desc = desc; priv->font_desc = desc;
priv->wrap_width = -1;
if (label->priv->text && label->priv->text[0] != '\0') if (label->priv->text && label->priv->text[0] != '\0')
{ {
clutter_label_clear_layout (label); clutter_label_clear_layout (label);
if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR(label))) if (CLUTTER_ACTOR_IS_VISIBLE (label))
clutter_actor_queue_redraw (CLUTTER_ACTOR (label)); clutter_actor_queue_redraw (CLUTTER_ACTOR (label));
} }
@ -988,7 +1196,7 @@ clutter_label_get_layout (ClutterLabel *label)
{ {
g_return_val_if_fail (CLUTTER_IS_LABEL (label), NULL); g_return_val_if_fail (CLUTTER_IS_LABEL (label), NULL);
clutter_label_ensure_layout (label, -1); clutter_label_ensure_layout (label);
return label->priv->layout; return label->priv->layout;
} }
@ -1170,3 +1378,54 @@ clutter_label_get_alignment (ClutterLabel *label)
return label->priv->alignment; return label->priv->alignment;
} }
/**
* clutter_label_set_justify:
* @label: a #ClutterLabel
* @justify: whether the text should be justified
*
* Sets whether the text of the @label actor should be justified
* on both margins. This setting is ignored if Clutter is compiled
* against Pango &gt; 1.18.
*
* Since: 0.6
*/
void
clutter_label_set_justify (ClutterLabel *label,
gboolean justify)
{
ClutterLabelPrivate *priv;
g_return_if_fail (CLUTTER_IS_LABEL (label));
priv = label->priv;
if (priv->justify != justify)
{
priv->justify = justify;
clutter_label_clear_layout (label);
if (CLUTTER_ACTOR_IS_VISIBLE (label))
clutter_actor_queue_redraw (CLUTTER_ACTOR (label));
g_object_notify (G_OBJECT (label), "justify");
}
}
/**
* clutter_label_get_justify:
* @label: a #ClutterLabel
*
* Retrieves whether the label should justify the text on both margins.
*
* Return value: %TRUE if the text should be justified
*
* Since: 0.6
*/
gboolean
clutter_label_get_justify (ClutterLabel *label)
{
g_return_val_if_fail (CLUTTER_IS_LABEL (label), FALSE);
return label->priv->justify;
}

3
clutter/clutter-label.h
View File

@ -117,6 +117,9 @@ gboolean clutter_label_get_use_markup (ClutterLabel *labe
void clutter_label_set_alignment (ClutterLabel *label, void clutter_label_set_alignment (ClutterLabel *label,
PangoAlignment alignment); PangoAlignment alignment);
PangoAlignment clutter_label_get_alignment (ClutterLabel *label); PangoAlignment clutter_label_get_alignment (ClutterLabel *label);
void clutter_label_set_justify (ClutterLabel *label,
gboolean justify);
gboolean clutter_label_get_justify (ClutterLabel *label);
G_END_DECLS G_END_DECLS

3
clutter/clutter-units.h
View File

@ -81,7 +81,8 @@ typedef gint32 ClutterUnit;
#define CLUTTER_UNITS_FROM_FIXED(x) (x) #define CLUTTER_UNITS_FROM_FIXED(x) (x)
#define CLUTTER_UNITS_TO_FIXED(x) (x) #define CLUTTER_UNITS_TO_FIXED(x) (x)
#define CLUTTER_UNITS_FROM_PANGO_UNIT(x) (x << 6) #define CLUTTER_UNITS_FROM_PANGO_UNIT(x) ((x) << 6)
#define CLUTTER_UNITS_TO_PANGO_UNIT(x) ((x) >> 6)
G_END_DECLS G_END_DECLS

5
doc/reference/ChangeLog
View File

@ -1,3 +1,8 @@
2007-11-19 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-sections.txt: Add ClutterScore symbols and
ClutterLabel:justify accessors.
2007-11-19 Emmanuele Bassi <ebassi@openedhand.com> 2007-11-19 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-sections.txt: Remove clutter_behaviour_bspline_append() and * clutter-sections.txt: Remove clutter_behaviour_bspline_append() and

52
doc/reference/clutter-sections.txt
View File

@ -29,16 +29,17 @@ clutter_media_get_type
<TITLE>Unit conversion</TITLE> <TITLE>Unit conversion</TITLE>
ClutterUnit ClutterUnit
CLUTTER_UNITS_FROM_DEVICE CLUTTER_UNITS_FROM_DEVICE
CLUTTER_UNITS_TO_DEVICE
CLUTTER_UNITS_FROM_FIXED CLUTTER_UNITS_FROM_FIXED
CLUTTER_UNITS_TO_FIXED
CLUTTER_UNITS_FROM_FLOAT CLUTTER_UNITS_FROM_FLOAT
CLUTTER_UNITS_TO_FLOAT
CLUTTER_UNITS_FROM_INT CLUTTER_UNITS_FROM_INT
CLUTTER_UNITS_TO_INT
CLUTTER_UNITS_FROM_PANGO_UNIT CLUTTER_UNITS_FROM_PANGO_UNIT
CLUTTER_UNITS_TO_PANGO_UNIT
CLUTTER_UNITS_TMP_FROM_DEVICE CLUTTER_UNITS_TMP_FROM_DEVICE
CLUTTER_UNITS_TMP_TO_DEVICE CLUTTER_UNITS_TMP_TO_DEVICE
CLUTTER_UNITS_TO_DEVICE
CLUTTER_UNITS_TO_FIXED
CLUTTER_UNITS_TO_FLOAT
CLUTTER_UNITS_TO_INT
</SECTION> </SECTION>
<SECTION> <SECTION>
@ -68,6 +69,9 @@ clutter_label_set_use_markup
clutter_label_get_use_markup clutter_label_get_use_markup
clutter_label_set_alignment clutter_label_set_alignment
clutter_label_get_alignment clutter_label_get_alignment
clutter_label_get_justify
clutter_label_set_justify
<SUBSECTION Standard> <SUBSECTION Standard>
CLUTTER_LABEL CLUTTER_LABEL
CLUTTER_IS_LABEL CLUTTER_IS_LABEL
@ -238,6 +242,11 @@ clutter_container_get_type
ClutterLayout ClutterLayout
ClutterLayoutIface ClutterLayoutIface
ClutterLayoutFlags ClutterLayoutFlags
CLUTTER_LAYOUT_HAS
CLUTTER_LAYOUT_HAS_HEIGHT_FOR_WIDTH
CLUTTER_LAYOUT_HAS_NATURAL_SIZE
CLUTTER_LAYOUT_HAS_TUNABLE_SIZE
CLUTTER_LAYOUT_HAS_WIDTH_FOR_HEIGHT
clutter_layout_get_layout_flags clutter_layout_get_layout_flags
clutter_layout_height_for_width clutter_layout_height_for_width
clutter_layout_natural_request clutter_layout_natural_request
@ -307,6 +316,8 @@ clutter_actor_destroy
clutter_actor_request_coords clutter_actor_request_coords
clutter_actor_query_coords clutter_actor_query_coords
clutter_actor_event clutter_actor_event
clutter_actor_pick
clutter_actor_should_pick_paint
<SUBSECTION> <SUBSECTION>
clutter_actor_set_geometry clutter_actor_set_geometry
@ -1243,3 +1254,36 @@ CLUTTER_MODEL_ITER_GET_CLASS
ClutterModelIterPrivate ClutterModelIterPrivate
clutter_model_iter_get_type clutter_model_iter_get_type
</SECTION> </SECTION>
<SECTION>
<FILE>clutter-score</FILE>
<TITLE>ClutterScore</TITLE>
ClutterScore
ClutterScoreClass
clutter_score_new
clutter_score_add
clutter_score_append
clutter_score_remove
clutter_score_remove_all
clutter_score_set_loop
clutter_score_get_loop
<SUBSECTION>
clutter_score_start
clutter_score_pause
clutter_score_stop
clutter_score_is_playing
clutter_score_rewind
<SUBSECTION Standard>
CLUTTER_IS_SCORE
CLUTTER_IS_SCORE_CLASS
CLUTTER_SCORE
CLUTTER_SCORE_CLASS
CLUTTER_SCORE_GET_CLASS
CLUTTER_TYPE_SCORE
<SUBSECTION Private>
ClutterScorePrivate
clutter_score_get_type
</SECTION>

4
tests/test-rotate.c
View File

@ -35,9 +35,7 @@ main (int argc, char *argv[])
clutter_actor_show (hand); clutter_actor_show (hand);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), hand); clutter_container_add_actor (CLUTTER_CONTAINER (stage), hand);
label = clutter_label_new_with_text ("Mono 16", label = clutter_label_new_with_text ("Mono 16", "The Wonder of the Spinning Hand");
"The Wonder of the Spinning Hand\n\n ");
clutter_actor_set_position (label, 150, 150); clutter_actor_set_position (label, 150, 150);
clutter_actor_show (label); clutter_actor_show (label);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), label); clutter_container_add_actor (CLUTTER_CONTAINER (stage), label);