Commit ecd7479a authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Paint focus before shadow to give theme engines a bit more flexibility.

Mon Jan 28 18:25:10 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkentry.c (gtk_entry_draw_frame): Paint focus
        before shadow to give theme engines a bit more
        flexibility. (#69857)
parent cb133a75
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
Mon Jan 28 18:25:10 2002 Owen Taylor <otaylor@redhat.com>
* 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 <jrb@redhat.com>
* 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 <jrb@redhat.com>
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 <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
......
......@@ -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
......
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