Commit 18fb9bcd authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

Set the attributes onto the PangoLayout even if they are newly created

Wed Jan 17 16:22:54 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtklabel.c (gtk_label_size_request): Set the
	attributes onto the PangoLayout even if they are newly
	created from label->pattern.
parent 75254120
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
Wed Jan 17 16:22:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_size_request): Set the
attributes onto the PangoLayout even if they are newly
created from label->pattern.
Tue Jan 9 11:20:48 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c: Remove unused variable.
......
......@@ -513,15 +513,18 @@ gtk_label_size_request (GtkWidget *widget,
* permanently, and just modifes or creates the AttrList
*/
if (label->attrs)
{
attrs = pango_attr_list_copy (label->attrs);
pango_layout_set_attributes (label->layout, attrs);
}
else
attrs = pango_attr_list_copy (label->attrs);
else if (label->pattern)
attrs = pango_attr_list_new ();
gtk_label_pattern_to_attrs (label, attrs);
pango_attr_list_unref (attrs);
if (label->pattern)
gtk_label_pattern_to_attrs (label, attrs);
if (attrs)
{
pango_layout_set_attributes (label->layout, attrs);
pango_attr_list_unref (attrs);
}
switch (label->jtype)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment