From 71d3e037a6934fbb4b57aed30c77efcc1efff3b0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 4 Oct 2011 22:07:27 +0200 Subject: Allow deselect_object() to delete empty objects safely --- src/tool_text.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/tool_text.c') diff --git a/src/tool_text.c b/src/tool_text.c index d40100f..8866d61 100644 --- a/src/tool_text.c +++ b/src/tool_text.c @@ -179,11 +179,7 @@ static void update_text(struct text_object *o) o->fontdesc = pango_font_description_from_string(o->base.style->font); pango_layout_set_font_description(o->layout, o->fontdesc); - if ( furniture ) { - calculate_size_from_style(o, &eright, &ebottom, &mw, &mh); - } else { - pango_layout_set_alignment(o->layout, PANGO_ALIGN_LEFT); - } + calculate_size_from_style(o, &eright, &ebottom, &mw, &mh); pango_layout_get_extents(o->layout, NULL, &logical); o->base.bb_width = logical.width / PANGO_SCALE; @@ -451,11 +447,14 @@ static void select_object(struct object *o,struct toolinfo *tip) } -static void deselect_object(struct object *o,struct toolinfo *tip) +static int deselect_object(struct object *o,struct toolinfo *tip) { if ( (o != NULL) && o->empty ) { delete_object(o); + return 1; } + + return 0; } -- cgit v1.2.3