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

remove the "child-spacing" style property again and add "inner-border"

Browse Source 
2006-01-17  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkbutton.c: remove the "child-spacing" style property again
	and add "inner-border" instead. That's far more flexible and
	"child-spacing" was a bad name anyway.
This commit is contained in:
Michael Natterer 2006-01-17 15:49:18 +00:00 committed by Michael Natterer
parent 4f1690df53
commit fbcf588227
3 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-17 Michael Natterer <mitch@imendio.com>
* gtk/gtkbutton.c: remove the "child-spacing" style property again
and add "inner-border" instead. That's far more flexible and
"child-spacing" was a bad name anyway.
2006-01-17 Michael Natterer <mitch@imendio.com> 2006-01-17 Michael Natterer <mitch@imendio.com>
* configure.in (ALL_LINGUAS): remove "ang" again until all po * configure.in (ALL_LINGUAS): remove "ang" again until all po

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-01-17 Michael Natterer <mitch@imendio.com>
* gtk/gtkbutton.c: remove the "child-spacing" style property again
and add "inner-border" instead. That's far more flexible and
"child-spacing" was a bad name anyway.
2006-01-17 Michael Natterer <mitch@imendio.com> 2006-01-17 Michael Natterer <mitch@imendio.com>
* configure.in (ALL_LINGUAS): remove "ang" again until all po * configure.in (ALL_LINGUAS): remove "ang" again until all po

67
gtk/gtkbutton.c
View File

@ -41,6 +41,7 @@
static const GtkBorder default_default_border = { 1, 1, 1, 1 }; static const GtkBorder default_default_border = { 1, 1, 1, 1 };
static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 }; static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
static const GtkBorder default_inner_border = { 1, 1, 1, 1 };
/* Time out before giving up on getting a key release when animating /* Time out before giving up on getting a key release when animating
* the close button. * the close button.
@ -460,20 +461,18 @@ gtk_button_class_init (GtkButtonClass *klass)
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
/** /**
* GtkButton:child-spacing: * GtkButton:inner-border:
* *
* Sets the spacing between the button edges and child. * Sets the border between the button edges and child.
* *
* Since: 2.10 * Since: 2.10
*/ */
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("child-spacing", g_param_spec_boxed ("inner-border",
_("Child spacing"), P_("Inner Border"),
_("Spacing between button edges and child."), P_("Border between button edges and child."),
0, GTK_TYPE_BORDER,
G_MAXINT, GTK_PARAM_READABLE));
1,
GTK_PARAM_READABLE));
gtk_settings_install_property (g_param_spec_boolean ("gtk-button-images", gtk_settings_install_property (g_param_spec_boolean ("gtk-button-images",
P_("Show button images"), P_("Show button images"),
@ -967,6 +966,7 @@ static void
gtk_button_get_props (GtkButton *button, gtk_button_get_props (GtkButton *button,
GtkBorder *default_border, GtkBorder *default_border,
GtkBorder *default_outside_border, GtkBorder *default_outside_border,
GtkBorder *inner_border,
gboolean *interior_focus) gboolean *interior_focus)
{ {
GtkWidget *widget = GTK_WIDGET (button); GtkWidget *widget = GTK_WIDGET (button);
@ -998,6 +998,19 @@ gtk_button_get_props (GtkButton *button,
*default_outside_border = default_default_outside_border; *default_outside_border = default_default_outside_border;
} }
if (inner_border)
{
gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL);
if (tmp_border)
{
*inner_border = *tmp_border;
g_free (tmp_border);
}
else
*inner_border = default_inner_border;
}
if (interior_focus) if (interior_focus)
gtk_widget_style_get (widget, "interior-focus", interior_focus, NULL); gtk_widget_style_get (widget, "interior-focus", interior_focus, NULL);
} }
@ -1008,21 +1021,22 @@ gtk_button_size_request (GtkWidget *widget,
{ {
GtkButton *button = GTK_BUTTON (widget); GtkButton *button = GTK_BUTTON (widget);
GtkBorder default_border; GtkBorder default_border;
GtkBorder inner_border;
gint focus_width; gint focus_width;
gint focus_pad; gint focus_pad;
gint child_spacing;
gtk_button_get_props (button, &default_border, NULL, NULL); gtk_button_get_props (button, &default_border, NULL, &inner_border, 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,
"child-spacing", &child_spacing,
NULL); NULL);
requisition->width = (GTK_CONTAINER (widget)->border_width + child_spacing + requisition->width = ((GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->xthickness) * 2; GTK_WIDGET (widget)->style->xthickness) * 2 +
requisition->height = (GTK_CONTAINER (widget)->border_width + child_spacing + inner_border.left + inner_border.right);
GTK_WIDGET (widget)->style->ythickness) * 2; requisition->height = ((GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->ythickness) * 2 +
inner_border.top + inner_border.bottom);
if (GTK_WIDGET_CAN_DEFAULT (widget)) if (GTK_WIDGET_CAN_DEFAULT (widget))
{ {
@ -1055,15 +1069,14 @@ gtk_button_size_allocate (GtkWidget *widget,
gint xthickness = GTK_WIDGET (widget)->style->xthickness; gint xthickness = GTK_WIDGET (widget)->style->xthickness;
gint ythickness = GTK_WIDGET (widget)->style->ythickness; gint ythickness = GTK_WIDGET (widget)->style->ythickness;
GtkBorder default_border; GtkBorder default_border;
GtkBorder inner_border;
gint focus_width; gint focus_width;
gint focus_pad; gint focus_pad;
gint child_spacing;
gtk_button_get_props (button, &default_border, NULL, NULL); gtk_button_get_props (button, &default_border, NULL, &inner_border, 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,
"child-spacing", &child_spacing,
NULL); NULL);
@ -1078,12 +1091,18 @@ gtk_button_size_allocate (GtkWidget *widget,
if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child)) if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
{ {
child_allocation.x = widget->allocation.x + border_width + child_spacing + xthickness; child_allocation.x = widget->allocation.x + border_width + inner_border.left + xthickness;
child_allocation.y = widget->allocation.y + border_width + child_spacing + ythickness; child_allocation.y = widget->allocation.y + border_width + inner_border.top + ythickness;
child_allocation.width = MAX (1, widget->allocation.width - (child_spacing + xthickness) * 2 - child_allocation.width = MAX (1, widget->allocation.width -
xthickness * 2 -
inner_border.left -
inner_border.right -
border_width * 2); border_width * 2);
child_allocation.height = MAX (1, widget->allocation.height - (child_spacing + ythickness) * 2 - child_allocation.height = MAX (1, widget->allocation.height -
ythickness * 2 -
inner_border.top -
inner_border.bottom -
border_width * 2); border_width * 2);
if (GTK_WIDGET_CAN_DEFAULT (button)) if (GTK_WIDGET_CAN_DEFAULT (button))
@ -1142,7 +1161,7 @@ _gtk_button_paint (GtkButton *button,
widget = GTK_WIDGET (button); widget = GTK_WIDGET (button);
border_width = GTK_CONTAINER (widget)->border_width; border_width = GTK_CONTAINER (widget)->border_width;
gtk_button_get_props (button, &default_border, &default_outside_border, &interior_focus); gtk_button_get_props (button, &default_border, &default_outside_border, NULL, &interior_focus);
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,