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

entry: Fix node ordering

Browse Source 
Fix the icon order
This commit is contained in:
Timm Bäder 2017-06-26 14:50:48 +02:00 committed by Matthias Clasen
parent 271749d4a6
commit fb1d2719d9
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkentry.c
View File

@ -2853,8 +2853,8 @@ update_node_ordering (GtkEntry *entry)
{ {
GtkEntryPrivate *priv = entry->priv; GtkEntryPrivate *priv = entry->priv;
EntryIconInfo *icon_info; EntryIconInfo *icon_info;
GtkEntryIconPosition icon_pos; GtkEntryIconPosition first_icon_pos, second_icon_pos;
GtkCssNode *sibling, *parent; GtkCssNode *parent;
if (priv->progress_widget) if (priv->progress_widget)
{ {
@ -2864,21 +2864,25 @@ update_node_ordering (GtkEntry *entry)
} }
if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
icon_pos = GTK_ENTRY_ICON_SECONDARY;
else
icon_pos = GTK_ENTRY_ICON_PRIMARY;
icon_info = priv->icons[icon_pos];
if (icon_info)
{ {
GtkCssNode *node; first_icon_pos = GTK_ENTRY_ICON_SECONDARY;
second_icon_pos = GTK_ENTRY_ICON_PRIMARY;
node = gtk_widget_get_css_node (icon_info->widget);
parent = gtk_css_node_get_parent (node);
sibling = gtk_css_node_get_first_child (parent);
if (node != sibling)
gtk_css_node_insert_before (parent, node, sibling);
} }
else
{
first_icon_pos = GTK_ENTRY_ICON_PRIMARY;
second_icon_pos = GTK_ENTRY_ICON_SECONDARY;
}
parent = gtk_widget_get_css_node (GTK_WIDGET (entry));
icon_info = priv->icons[first_icon_pos];
if (icon_info)
gtk_css_node_insert_after (parent, gtk_widget_get_css_node (icon_info->widget), NULL);
icon_info = priv->icons[second_icon_pos];
if (icon_info)
gtk_css_node_insert_before (parent, gtk_widget_get_css_node (icon_info->widget), NULL);
} }
static EntryIconInfo* static EntryIconInfo*