From ecd7479a37eb3df8ea2e94b42dbd227efe8eab6b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 28 Jan 2002 23:28:16 +0000 Subject: [PATCH] Paint focus before shadow to give theme engines a bit more flexibility. Mon Jan 28 18:25:10 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus before shadow to give theme engines a bit more flexibility. (#69857) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkentry.c | 16 ++++++++++++---- 8 files changed, 61 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0f3030a42f..81d647ce0e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jan 28 18:25:10 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus + before shadow to give theme engines a bit more + flexibility. (#69857) + Mon Jan 28 16:23:20 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): no longer @@ -33,6 +39,7 @@ Mon Jan 28 16:23:20 2002 Jonathan Blandford Pass a GtkStateType appropriate to the focussed cell's state to gtk_paint_focus. +>>>>>>> 1.2878 Mon Jan 28 14:44:40 2002 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index bc0dec1766..1083a37cc9 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1255,10 +1255,6 @@ gtk_entry_draw_frame (GtkWidget *widget) if (GTK_WIDGET_HAS_FOCUS (widget) && !interior_focus) { - gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget), - NULL, widget, "entry", - 0, 0, width, height); - x += focus_width; y += focus_width; width -= 2 * focus_width; @@ -1269,6 +1265,18 @@ gtk_entry_draw_frame (GtkWidget *widget) GTK_STATE_NORMAL, GTK_SHADOW_IN, NULL, widget, "entry", x, y, width, height); + + if (GTK_WIDGET_HAS_FOCUS (widget) && !interior_focus) + { + x -= focus_width; + y -= focus_width; + width += 2 * focus_width; + height += 2 * focus_width; + + gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget), + NULL, widget, "entry", + 0, 0, width, height); + } } static gint