aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-04-12 03:44:35 +0800
committerChris Lahey <clahey@src.gnome.org>2000-04-12 03:44:35 +0800
commit879dbf98d742303050d5c94cd58dd1331b69510b (patch)
treebab458ec539abb968abebb459926fc232177f1b5
parent7cbc26471fb6ff8d789fe91df342d87e3678e712 (diff)
downloadgsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.tar
gsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.tar.gz
gsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.tar.bz2
gsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.tar.lz
gsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.tar.xz
gsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.tar.zst
gsoc2013-evolution-879dbf98d742303050d5c94cd58dd1331b69510b.zip
Moved some logic a bit. Minor changes.
2000-04-11 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Moved some logic a bit. Minor changes. svn path=/trunk/; revision=2396
-rw-r--r--ChangeLog4
-rw-r--r--widgets/e-text/e-text.c9
-rw-r--r--widgets/text/e-text.c9
3 files changed, 6 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bca159208..d269f8368e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.