diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | widgets/e-text/e-text.c | 9 | ||||
| -rw-r--r-- | widgets/text/e-text.c | 9 |
3 files changed, 6 insertions, 16 deletions
@@ -1,3 +1,7 @@ +2000-04-11 Christopher James Lahey <clahey@helixcode.com> + + * widgets/e-text/e-text.c: Moved some logic a bit. Minor changes. + 00-04-11 Iain Holmes <ih@csd.abdn.ac.uk> * widgets/e-text/e-text.c diff --git a/widgets/e-text/e-text.c b/widgets/e-text/e-text.c index 294795986f..3a4361b8fa 100644 --- a/widgets/e-text/e-text.c +++ b/widgets/e-text/e-text.c @@ -595,7 +595,6 @@ get_bounds (EText *text, double *px1, double *py1, double *px2, double *py2) *px2 = text->cx + text->max_width; *py2 = text->cy + text->height; } - } static void @@ -1058,7 +1057,6 @@ e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) else text->needs_calc_line_widths = 1; needs_reflow = 1; - text->needs_recalc_bounds = 1; break; case ARG_CLIP_HEIGHT: @@ -1185,7 +1183,6 @@ e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) else text->needs_calc_line_widths = 1; needs_reflow = 1; - text->needs_recalc_bounds = 1; break; default: @@ -1382,6 +1379,7 @@ e_text_reflow (GnomeCanvasItem *item, int flags) calc_height (text); gnome_canvas_item_request_update(item); text->needs_calc_height = 0; + text->needs_recalc_bounds = 1; } } @@ -1862,11 +1860,6 @@ e_text_point (GnomeCanvasItem *item, double x, double y, lines = text->lines; -#if 0 - if ( lines ) - return 1; -#endif - for (i = 0; i < text->num_lines; i++) { /* Compute the coordinates of rectangle for the current line, * clipping if appropriate. diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 294795986f..3a4361b8fa 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -595,7 +595,6 @@ get_bounds (EText *text, double *px1, double *py1, double *px2, double *py2) *px2 = text->cx + text->max_width; *py2 = text->cy + text->height; } - } static void @@ -1058,7 +1057,6 @@ e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) else text->needs_calc_line_widths = 1; needs_reflow = 1; - text->needs_recalc_bounds = 1; break; case ARG_CLIP_HEIGHT: @@ -1185,7 +1183,6 @@ e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) else text->needs_calc_line_widths = 1; needs_reflow = 1; - text->needs_recalc_bounds = 1; break; default: @@ -1382,6 +1379,7 @@ e_text_reflow (GnomeCanvasItem *item, int flags) calc_height (text); gnome_canvas_item_request_update(item); text->needs_calc_height = 0; + text->needs_recalc_bounds = 1; } } @@ -1862,11 +1860,6 @@ e_text_point (GnomeCanvasItem *item, double x, double y, lines = text->lines; -#if 0 - if ( lines ) - return 1; -#endif - for (i = 0; i < text->num_lines; i++) { /* Compute the coordinates of rectangle for the current line, * clipping if appropriate. |