callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use _static variants when copying and merging short-lived Pango layouts.

Browse Source 
2006-04-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcellrenderertext.c (get_size): Use _static variants when
	copying and merging short-lived Pango layouts. (#340033, Morten Welinder)
This commit is contained in:
Matthias Clasen
2006-04-29 03:53:25 +00:00
committed by Matthias Clasen
parent 0bce92f67d
commit 6162f9d51a
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellrenderertext.c (get_size): Use _static variants when
copying and merging short-lived Pango layouts. (#340033, Morten Welinder)
2006-04-28 Behdad Esfahbod <behdad@gnome.org> 2006-04-28 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-04-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellrenderertext.c (get_size): Use _static variants when
copying and merging short-lived Pango layouts. (#340033, Morten Welinder)
2006-04-28 Behdad Esfahbod <behdad@gnome.org> 2006-04-28 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in

4
gtk/gtkcellrenderertext.c
View File

@ -1497,8 +1497,8 @@ get_size (GtkCellRenderer *cell,
PangoFontDescription *font_desc; PangoFontDescription *font_desc;
gint row_height; gint row_height;
font_desc = pango_font_description_copy (widget->style->font_desc); font_desc = pango_font_description_copy_static (widget->style->font_desc);
pango_font_description_merge (font_desc, celltext->font, TRUE); pango_font_description_merge_static (font_desc, celltext->font, TRUE);
if (celltext->scale_set) if (celltext->scale_set)
pango_font_description_set_size (font_desc, pango_font_description_set_size (font_desc,