AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkToolButton: Drop use of GtkMisc

Browse Source 
Use h/valign instead of x/yalign.

https://bugzilla.gnome.org/show_bug.cgi?id=730613
This commit is contained in:
Matthias Clasen 2014-05-22 22:54:18 -04:00
parent 687eae4b51
commit 1008e15414
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gtk/gtktoolbutton.c
View File

@ -488,25 +488,33 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
text_orientation = gtk_tool_item_get_text_orientation (GTK_TOOL_ITEM (button)); text_orientation = gtk_tool_item_get_text_orientation (GTK_TOOL_ITEM (button));
if (text_orientation == GTK_ORIENTATION_HORIZONTAL) if (text_orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
gfloat align;
gtk_label_set_angle (GTK_LABEL (label), 0); gtk_label_set_angle (GTK_LABEL (label), 0);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS align = gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button));
gtk_misc_set_alignment (GTK_MISC (label), if (align < 0.4)
gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button)), gtk_widget_set_halign (label, GTK_ALIGN_START);
0.5); else if (align > 0.6)
G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_set_halign (label, GTK_ALIGN_END);
else
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
} }
else else
{ {
gfloat align;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE);
if (gtk_widget_get_direction (GTK_WIDGET (tool_item)) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (GTK_WIDGET (tool_item)) == GTK_TEXT_DIR_RTL)
gtk_label_set_angle (GTK_LABEL (label), -90); gtk_label_set_angle (GTK_LABEL (label), -90);
else else
gtk_label_set_angle (GTK_LABEL (label), 90); gtk_label_set_angle (GTK_LABEL (label), 90);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS align = gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button));
gtk_misc_set_alignment (GTK_MISC (label), if (align < 0.4)
0.5, gtk_widget_set_valign (label, GTK_ALIGN_END);
1 - gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button))); else if (align > 0.6)
G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_set_valign (label, GTK_ALIGN_START);
else
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
} }
} }
} }
@ -547,19 +555,33 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_show (icon); gtk_widget_show (icon);
} }
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_MISC (icon) && text_orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_misc_set_alignment (GTK_MISC (icon),
1.0 - gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button)),
0.5);
else if (GTK_IS_MISC (icon))
gtk_misc_set_alignment (GTK_MISC (icon),
0.5,
gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button)));
G_GNUC_END_IGNORE_DEPRECATIONS
if (icon) if (icon)
{ {
if (text_orientation == GTK_ORIENTATION_HORIZONTAL)
{
gfloat align;
align = gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button));
if (align > 0.6)
gtk_widget_set_halign (icon, GTK_ALIGN_START);
else if (align < 0.4)
gtk_widget_set_halign (icon, GTK_ALIGN_END);
else
gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
}
else
{
gfloat align;
align = gtk_tool_item_get_text_alignment (GTK_TOOL_ITEM (button));
if (align > 0.6)
gtk_widget_set_valign (icon, GTK_ALIGN_END);
else if (align < 0.4)
gtk_widget_set_valign (icon, GTK_ALIGN_START);
else
gtk_widget_set_valign (icon, GTK_ALIGN_CENTER);
}
size_group = gtk_tool_item_get_text_size_group (GTK_TOOL_ITEM (button)); size_group = gtk_tool_item_get_text_size_group (GTK_TOOL_ITEM (button));
if (size_group != NULL) if (size_group != NULL)
gtk_size_group_add_widget (size_group, icon); gtk_size_group_add_widget (size_group, icon);