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

combobox: cleanup allocation of children in list mode

Browse Source 
Instead of setting the same values for child allocation in different
places, just do it once.
This commit is contained in:
Cosimo Cecchi 2012-01-31 18:45:09 -05:00
parent a8211b75b2
commit ec6b36add5
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcombobox.c
View File

@ -2681,18 +2681,14 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
if (is_rtl) if (is_rtl)
child.x = button_allocation.x + button_allocation.width; child.x = button_allocation.x + button_allocation.width;
else else
child.x = allocation->x; child.x = allocation->x + padding.left + border_width;
child.y = allocation->y; child.y = allocation->y + padding.top + border_width;
child.width = allocation->width - button_allocation.width - (padding.left + padding.right); child.width = allocation->width - button_allocation.width - (2 * border_width + padding.left + padding.right);
child.height = button_allocation.height; child.height = button_allocation.height - 2 * border_width;
if (priv->cell_view_frame) if (priv->cell_view_frame)
{ {
child.x += padding.left + border_width;
child.y += padding.top + border_width;
child.width = MAX (1, child.width - (2 * border_width) - (padding.left + padding.right));
child.height = MAX (1, child.height - (2 * border_width) - (padding.top + padding.bottom));
gtk_widget_size_allocate (priv->cell_view_frame, &child); gtk_widget_size_allocate (priv->cell_view_frame, &child);
/* restrict allocation of the child into the frame box if it's present */ /* restrict allocation of the child into the frame box if it's present */
@ -2709,13 +2705,6 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
child.height -= (2 * border_width) + frame_padding.top + frame_padding.bottom; child.height -= (2 * border_width) + frame_padding.top + frame_padding.bottom;
} }
} }
else
{
child.x += padding.left + border_width;
child.y += padding.top + border_width;
child.width -= (2 * border_width) - (padding.left + padding.right);
child.height -= (2 * border_width) - (padding.top + padding.bottom);
}
if (gtk_widget_get_visible (priv->popup_window)) if (gtk_widget_get_visible (priv->popup_window))
{ {