[Commit] gwaterfall/src waterfall.c,1.1,1.2

Noah Levitt commit@keithp.com
Sun, 27 Apr 2003 20:10:33 -0700


Committed by: nlevitt

Update of /local/src/CVS/gwaterfall/src
In directory home.keithp.com:/tmp/cvs-serv11702

Modified Files:
	waterfall.c 
Log Message:
Allocate the correct width.


Index: waterfall.c
===================================================================
RCS file: /local/src/CVS/gwaterfall/src/waterfall.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- waterfall.c	28 Apr 2003 02:45:45 -0000	1.1
+++ waterfall.c	28 Apr 2003 03:10:30 -0000	1.2
@@ -106,6 +106,8 @@
   gdouble lines;
   XftFont *big_font, *small_font, *theme_font;
   gchar *buf;
+  gunichar ucs[128];
+  gint ucs_len;
 
   small_font = open_font (waterfall, waterfall->min_size);
   big_font = open_font (waterfall, waterfall->max_size);
@@ -113,8 +115,8 @@
                                 pango_font_description_to_string (
                                     GTK_WIDGET (waterfall)->style->font_desc));
 
-  XftTextExtentsUtf8 (GDK_DISPLAY (), big_font, DEFAULT_STRING, 
-                      strlen (DEFAULT_STRING), &extents);
+  get_string_for_page (waterfall, ucs, &ucs_len);
+  XftTextExtents32 (GDK_DISPLAY (), big_font, ucs, ucs_len, &extents);
   *width = extents.width + BUFFER;
 
   buf = g_strdup_printf ("%5.1f", waterfall->max_size);