Re: [evolution-patches] 41498: use unicode ellipsis and fix for tight loop on small cells

[Mike Kestner <mkestner ximian com>]

The patch also has the 41892 changes in it, since it's still pending. 
This just falls back to "..." instead of the unicode ellipsis.

Mike

On Mon, 2003-04-28 at 22:25, Not Zed wrote:
> i tried this yesterday and forgot to reply- yeah this stops it
> happening.
> 
> On Fri, 2003-04-25 at 00:46, Mike Kestner wrote:
> > The patch too this time.
> > 
> > On Thu, 2003-04-24 at 10:15, Mike Kestner wrote:
> > > On Wed, 2003-04-23 at 21:55, Not Zed wrote:
> > > > They dont here!  See attached picture!
> > > > 
> > > > If anything is too wide to fit, i get that mess, at least from cvs of
> > > > about 20 hours ago.
> > > 
> > > My only guess is pango barfs on unicode ellipsis chars with your font
> > > setup.  Does this "patch" fix things?
> > > 
> > > Mike
> 

Index: gal/e-table/ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.888
diff -u -p -r1.888 ChangeLog
--- gal/e-table/ChangeLog	28 Apr 2003 21:03:35 -0000	1.888
+++ gal/e-table/ChangeLog	29 Apr 2003 16:15:52 -0000
@@ -1,3 +1,13 @@
+2003-04-29  Mike Kestner  <mkestner ximian com>
+
+	* e-cell-text.c (build_layout): don't use unicode ellipsis so
+	that we don't break on broken font setups.
+
+2003-04-29  Mike Kestner  <mkestner ximian com>
+
+	* e-cell-text.c (generate_layout): don't set width on the layout
+	during edit 
+
 2003-04-28  Mike Kestner  <mkestner ximian com>
 
 	* e-cell-text.c (build_layout): don't do wrapping during edit 
Index: gal/e-table/e-cell-text.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-cell-text.c,v
retrieving revision 1.125
diff -u -p -r1.125 e-cell-text.c
--- gal/e-table/e-cell-text.c	28 Apr 2003 21:03:35 -0000	1.125
+++ gal/e-table/e-cell-text.c	29 Apr 2003 16:15:53 -0000
@@ -493,15 +493,12 @@ build_layout (ECellTextView *text_view, 
 		PangoLayoutLine *line = pango_layout_get_line (layout, 0);
 		gchar *line_text = g_strdup (pango_layout_get_text (layout));
 		gchar *last_char = g_utf8_find_prev_char (line_text, line_text + line->length - 1);
-		gchar ellipsis[7];
-		int len = g_unichar_to_utf8 (8230, ellipsis);
-		ellipsis[len] = '\0';
 		while (last_char && pango_layout_get_line_count (layout) > 1) {
 			gchar *new_text;
 			last_char = g_utf8_find_prev_char (line_text, last_char);
 			if (last_char)
 				*last_char = '\0';
-			new_text = g_strconcat (line_text, ellipsis, NULL);
+			new_text = g_strconcat (line_text, "...", NULL);
 			pango_layout_set_text (layout, new_text, -1);
 			g_free (new_text);
 		}
@@ -533,8 +530,6 @@ generate_layout (ECellTextView *text_vie
 
 	if (edit && edit->layout && edit->model_col == model_col && edit->row == row) {
 		g_object_ref (edit->layout);
-		if (width > 0)
-			pango_layout_set_width (edit->layout, width * PANGO_SCALE);
 		return edit->layout;
 	}