mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
deb4dd0de4
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@277 311d38ba-8fff-0310-9ca6-ca027cbcb966
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
Index: libgtkhtml/view/htmlview.c
|
|
===================================================================
|
|
--- libgtkhtml/view/htmlview.c.orig 2006-02-11 04:45:41.000000000 +0000
|
|
+++ libgtkhtml/view/htmlview.c 2006-02-11 04:45:42.000000000 +0000
|
|
@@ -2286,9 +2286,7 @@ html_view_realize (GtkWidget *widget)
|
|
* GtkLayout uses the bg color for background but we want
|
|
* to use base color.
|
|
*/
|
|
- widget->style = gtk_style_copy (widget->style);
|
|
- widget->style->bg[GTK_STATE_NORMAL] =
|
|
- widget->style->base[GTK_STATE_NORMAL];
|
|
+ gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &widget->style->base[GTK_STATE_NORMAL]);
|
|
/*
|
|
* Store the font size so we can adjust size of HtmlFontSpecification
|
|
* if the size changes.
|
|
@@ -3189,9 +3187,10 @@ html_view_style_set (GtkWidget *widget,
|
|
"focus-line-width", &focus_width,
|
|
NULL);
|
|
|
|
-
|
|
- widget->style->bg[GTK_STATE_NORMAL] =
|
|
- widget->style->base[GTK_STATE_NORMAL];
|
|
+ if (!gdk_color_equal (&widget->style->bg[GTK_STATE_NORMAL], &widget->style->base[GTK_STATE_NORMAL])) {
|
|
+ gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &widget->style->base[GTK_STATE_NORMAL]);
|
|
+ return;
|
|
+ }
|
|
fsize = pango_font_description_get_size (widget->style->font_desc) / (gfloat) PANGO_SCALE;
|
|
new_isize = (gint) fsize;
|
|
old_isize = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "html-view-font-size"));
|