AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-19 09:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Go back to the initial fix for the focus-overdrawing problem, which was

Browse Source 
2004-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkbutton.c: Go back to the initial fix for the
	focus-overdrawing problem, which was actually correct
	according to docs/widget_geometry.txt.

	* gtk/gtkarrow.c (gtk_arrow_class_init): Bump the initial
	arrow size from 11 to 15 to compensate for that.
This commit is contained in:
Matthias Clasen 2004-05-18 17:50:04 +00:00 committed by Matthias Clasen
parent d9ee96cfce
commit 85eb55763f
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkarrow.c
View File

@ -29,7 +29,7 @@
#include "gtkarrow.h" #include "gtkarrow.h"
#include "gtkintl.h" #include "gtkintl.h"
#define MIN_ARROW_SIZE 11 #define MIN_ARROW_SIZE 14
enum { enum {
PROP_0, PROP_0,

28
gtk/gtkbutton.c
View File

@ -884,11 +884,10 @@ gtk_button_size_request (GtkWidget *widget,
{ {
GtkButton *button = GTK_BUTTON (widget); GtkButton *button = GTK_BUTTON (widget);
GtkBorder default_border; GtkBorder default_border;
gboolean interior_focus;
gint focus_width; gint focus_width;
gint focus_pad; gint focus_pad;
gtk_button_get_props (button, &default_border, NULL, &interior_focus); gtk_button_get_props (button, &default_border, NULL, NULL);
gtk_widget_style_get (GTK_WIDGET (widget), gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
"focus-padding", &focus_pad, "focus-padding", &focus_pad,
@ -915,11 +914,8 @@ gtk_button_size_request (GtkWidget *widget,
requisition->height += child_requisition.height; requisition->height += child_requisition.height;
} }
if (!interior_focus && GTK_WIDGET_CAN_FOCUS (widget)) requisition->width += 2 * (focus_width + focus_pad);
{ requisition->height += 2 * (focus_width + focus_pad);
requisition->width += 2 * (focus_width + focus_pad);
requisition->height += 2 * (focus_width + focus_pad);
}
} }
static void static void
@ -935,9 +931,8 @@ gtk_button_size_allocate (GtkWidget *widget,
GtkBorder default_border; GtkBorder default_border;
gint focus_width; gint focus_width;
gint focus_pad; gint focus_pad;
gboolean interior_focus;
gtk_button_get_props (button, &default_border, NULL, &interior_focus); gtk_button_get_props (button, &default_border, NULL, NULL);
gtk_widget_style_get (GTK_WIDGET (widget), gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
"focus-padding", &focus_pad, "focus-padding", &focus_pad,
@ -970,14 +965,11 @@ gtk_button_size_allocate (GtkWidget *widget,
child_allocation.width = MAX (1, child_allocation.width - default_border.left - default_border.right); child_allocation.width = MAX (1, child_allocation.width - default_border.left - default_border.right);
child_allocation.height = MAX (1, child_allocation.height - default_border.top - default_border.bottom); child_allocation.height = MAX (1, child_allocation.height - default_border.top - default_border.bottom);
} }
if (!interior_focus && GTK_WIDGET_CAN_FOCUS (widget)) child_allocation.x += focus_width + focus_pad;
{ child_allocation.y += focus_width + focus_pad;
child_allocation.x += focus_width + focus_pad; child_allocation.width = MAX (1, child_allocation.width - (focus_width + focus_pad) * 2);
child_allocation.y += focus_width + focus_pad; child_allocation.height = MAX (1, child_allocation.height - (focus_width + focus_pad) * 2);
child_allocation.width = MAX (1, child_allocation.width - (focus_width + focus_pad) * 2);
child_allocation.height = MAX (1, child_allocation.height - (focus_width + focus_pad) * 2);
}
if (button->depressed) if (button->depressed)
{ {
@ -1051,7 +1043,7 @@ _gtk_button_paint (GtkButton *button,
height -= default_outside_border.top + default_outside_border.bottom; height -= default_outside_border.top + default_outside_border.bottom;
} }
if (!interior_focus && GTK_WIDGET_CAN_FOCUS (widget)) if (!interior_focus && GTK_WIDGET_HAS_FOCUS (widget))
{ {
x += focus_width + focus_pad; x += focus_width + focus_pad;
y += focus_width + focus_pad; y += focus_width + focus_pad;