[evolution/foocanvas] Reset two commits and fixup e-text properly.
- From: Henning Habighorst <hhabig src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/foocanvas] Reset two commits and fixup e-text properly.
- Date: Thu, 20 May 2010 12:03:19 +0000 (UTC)
commit a9eb76a768ba4435af87c615255960c657fe255e
Author: H.Habighorst <h habighorst googlemail com>
Date: Thu May 20 14:02:51 2010 +0200
Reset two commits and fixup e-text properly.
addressbook/gui/widgets/e-minicard-label.c | 4 ++--
widgets/text/e-text.c | 26 ++++++++++++++++++++------
2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 1e02e02..c349c8d 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -307,7 +307,7 @@ e_minicard_label_realize (FooCanvasItem *item)
foo_canvas_item_new( group,
e_text_get_type(),
"anchor", GTK_ANCHOR_NW,
- "clip_width", (gdouble) fabs( e_minicard_label->width / 2 - 4 ),
+ "clip_width", (gdouble) (e_minicard_label->width / 2 - 4),
"clip", TRUE,
"use_ellipsis", TRUE,
"fill_color", "black",
@@ -320,7 +320,7 @@ e_minicard_label_realize (FooCanvasItem *item)
foo_canvas_item_new( group,
e_text_get_type(),
"anchor", GTK_ANCHOR_NW,
- "clip_width", (gdouble) fabs( ( e_minicard_label->width + 1 ) / 2 - 4 ),
+ "clip_width", (gdouble) ((e_minicard_label->width + 1) / 2 - 4),
"clip", TRUE,
"use_ellipsis", TRUE,
"fill_color", "black",
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 2af6a28..109b554 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -3386,14 +3386,14 @@ e_text_class_init (ETextClass *klass)
g_param_spec_double ("clip_width",
"Clip Width",
"Clip Width",
- 0.0, G_MAXDOUBLE, 0.0,
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_CLIP_HEIGHT,
g_param_spec_double ("clip_height",
"Clip Height",
"Clip Height",
- 0.0, G_MAXDOUBLE, 0.0,
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_CLIP,
@@ -3410,18 +3410,32 @@ e_text_class_init (ETextClass *klass)
FALSE,
G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, PROP_X,
+ g_param_spec_double ("x",
+ NULL,
+ NULL,
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class, PROP_X,
+ g_param_spec_double ("y",
+ NULL,
+ NULL,
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+ G_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class, PROP_X_OFFSET,
g_param_spec_double ("x_offset",
"X Offset",
"X Offset",
- 0.0, G_MAXDOUBLE, 0.0,
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_Y_OFFSET,
g_param_spec_double ("y_offset",
"Y Offset",
"Y Offset",
- 0.0, G_MAXDOUBLE, 0.0,
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_FILL_COLOR,
@@ -3602,8 +3616,8 @@ e_text_init (EText *text)
text->anchor = GTK_ANCHOR_CENTER;
text->justification = GTK_JUSTIFY_LEFT;
- text->clip_width = 0.0;
- text->clip_height = 0.0;
+ text->clip_width = -1.0;
+ text->clip_height = -1.0;
text->x = 0.0;
text->y = 0.0;
text->xofs = 0.0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]