AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor 2001-01-17 21:32:34 +00:00 committed by Owen Taylor
parent 7525412032
commit 18fb9bcd53
8 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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.

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
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.

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
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.

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
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.

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
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.

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
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.

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
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.

19
gtk/gtklabel.c
View File

@ -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)
{