From 752742d044d85135425e1a74e4f9a5ab4a2a26db Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Mon, 29 Apr 2002 23:34:08 +0000 Subject: [PATCH] Use tmp also if foreground is set. 2002-04-29 Alex Larsson * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): Use tmp also if foreground is set. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkpango.c | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 981ec71447..622075aa49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): + Use tmp also if foreground is set. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 981ec71447..622075aa49 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): + Use tmp also if foreground is set. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 981ec71447..622075aa49 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): + Use tmp also if foreground is set. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 981ec71447..622075aa49 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): + Use tmp also if foreground is set. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 981ec71447..622075aa49 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): + Use tmp also if foreground is set. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 981ec71447..622075aa49 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/gdkpango.c (gdk_draw_layout_line_with_colors): + Use tmp also if foreground is set. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 90d7729714..1422401ac0 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -275,7 +275,7 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable, tmp.green = foreground->green; } - fg_gc = gdk_pango_get_gc (drawable, context, fg_set ? &tmp : NULL, + fg_gc = gdk_pango_get_gc (drawable, context, (fg_set || foreground) ? &tmp : NULL, stipple, gc); } else