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

GtkButton: tighten code a bit

Browse Source 
Make it so we only use GtkMisc in one place.
This commit is contained in:
Matthias Clasen 2014-05-22 22:45:56 -04:00
parent 2df80d7a4d
commit d769f338f2
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkbutton.c
View File

@ -684,29 +684,12 @@ maybe_set_alignment (GtkButton *button,
{
GtkButtonPrivate *priv = button->priv;
if (!priv->align_set)
return;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_MISC (widget))
{
GtkMisc *misc = GTK_MISC (widget);
if (priv->align_set)
gtk_misc_set_alignment (misc, priv->xalign, priv->yalign);
}
else if (GTK_IS_ALIGNMENT (widget))
{
GtkAlignment *alignment = GTK_ALIGNMENT (widget);
gfloat xscale, yscale;
g_object_get (alignment,
"xscale", &xscale,
"yscale", &yscale,
NULL);
if (priv->align_set)
gtk_alignment_set (alignment,
priv->xalign, priv->yalign,
xscale, yscale);
}
if (GTK_IS_MISC (widget) || GTK_IS_ALIGNMENT (widget))
g_object_set (widget, "xalign", priv->xalign, "yalign", priv->yalign, NULL);
G_GNUC_END_IGNORE_DEPRECATIONS
}
@ -1297,10 +1280,7 @@ gtk_button_construct_child (GtkButton *button)
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (priv->align_set)
gtk_misc_set_alignment (GTK_MISC (label), priv->xalign, priv->yalign);
G_GNUC_END_IGNORE_DEPRECATIONS
maybe_set_alignment (button, label);
gtk_widget_show (label);
gtk_container_add (GTK_CONTAINER (button), label);