[Osmo-pim-svn] SF.net SVN: osmo-pim:[545] trunk/src/notes.c

[<pa...@us...>]

Revision: 545
          http://osmo-pim.svn.sourceforge.net/osmo-pim/?rev=545&view=rev
Author:   pasp
Date:     2008-08-04 01:37:58 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
* Use font first luke! ;-)

Modified Paths:
--------------
    trunk/src/notes.c

Modified: trunk/src/notes.c
===================================================================
--- trunk/src/notes.c	2008-08-04 01:17:25 UTC (rev 544)
+++ trunk/src/notes.c	2008-08-04 01:37:58 UTC (rev 545)
@@ -338,33 +338,28 @@
 
 gint chars, i;
 gchar tmpbuf[BUFFER_SIZE];
-GtkWidget *label;
 PangoLayout *layout;
 PangoRectangle logical_rect;
 
     GUI *appGUI = (GUI *)data;
 
-    label = gtk_label_new(NULL);
-    layout = gtk_widget_create_pango_layout (widget, NULL);
+    memset (tmpbuf, 0, BUFFER_SIZE);
+
     tmpbuf[0] = config.text_separator;
-    tmpbuf[1] = 0;
+    layout = gtk_widget_create_pango_layout (widget, NULL);
+    pango_layout_set_font_description (layout, appGUI->nte->fd_notes_font);
     pango_layout_set_text (layout, tmpbuf, -1);
     pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
     chars = (appGUI->nte->editor_textview)->allocation.width / logical_rect.width;
+    chars = (chars > BUFFER_SIZE) ? BUFFER_SIZE - 2 : chars;
 
-    if (chars > BUFFER_SIZE) {
-        chars = BUFFER_SIZE - 2;    /* \n + null */
-    }
-
     g_object_unref (G_OBJECT(layout));
-    gtk_widget_destroy (label);
 
     i = 0;
     tmpbuf[i++] = '\n';
     while (i < chars) tmpbuf[i++] = config.text_separator;
     tmpbuf[i++] = '\n';
-    tmpbuf[i] = '\0';
 
     gtk_text_buffer_insert_at_cursor (gtk_text_view_get_buffer (GTK_TEXT_VIEW (appGUI->nte->editor_textview)), 
                                       tmpbuf, -1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.