callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notebook: Simplify allocation code

Browse Source
This commit is contained in:
Benjamin Otte
2015-12-29 04:42:29 +01:00
parent 0e48216c48
commit 6b8c191096
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtknotebook.c
View File

@ -5577,7 +5577,6 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
gint max) gint max)
{ {
GtkNotebookPrivate *priv = notebook->priv; GtkNotebookPrivate *priv = notebook->priv;
GtkAllocation allocation;
GtkWidget *widget; GtkWidget *widget;
GtkNotebookPage *page; GtkNotebookPage *page;
gboolean allocate_at_bottom; gboolean allocate_at_bottom;
@ -5585,7 +5584,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
GtkPositionType tab_pos; GtkPositionType tab_pos;
gint left_x, right_x, top_y, bottom_y, anchor; gint left_x, right_x, top_y, bottom_y, anchor;
gboolean gap_left, packing_changed; gboolean gap_left, packing_changed;
GtkAllocation child_allocation = { 0, }; GtkAllocation child_allocation;
GtkOrientation tab_expand_orientation; GtkOrientation tab_expand_orientation;
g_assert (priv->cur_page != NULL); g_assert (priv->cur_page != NULL);
@ -5595,30 +5594,19 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
allocate_at_bottom = get_allocate_at_bottom (widget, direction); allocate_at_bottom = get_allocate_at_bottom (widget, direction);
anchor = 0; anchor = 0;
gtk_css_gadget_get_content_allocation (priv->gadget, &allocation, NULL); gtk_css_gadget_get_content_allocation (priv->tabs_gadget, &child_allocation, NULL);
child_allocation.x = allocation.x;
child_allocation.y = allocation.y;
switch (tab_pos) switch (tab_pos)
{ {
case GTK_POS_BOTTOM: case GTK_POS_BOTTOM:
child_allocation.y = allocation.y + allocation.height -
priv->cur_page->requisition.height;
/* fall through */
case GTK_POS_TOP: case GTK_POS_TOP:
child_allocation.x = (allocate_at_bottom) ? max : min; child_allocation.x = (allocate_at_bottom) ? max : min;
child_allocation.height = priv->cur_page->requisition.height;
anchor = child_allocation.x; anchor = child_allocation.x;
break; break;
case GTK_POS_RIGHT: case GTK_POS_RIGHT:
child_allocation.x = allocation.x + allocation.width -
priv->cur_page->requisition.width;
/* fall through */
case GTK_POS_LEFT: case GTK_POS_LEFT:
child_allocation.y = (allocate_at_bottom) ? max : min; child_allocation.y = (allocate_at_bottom) ? max : min;
child_allocation.width = priv->cur_page->requisition.width;
anchor = child_allocation.y; anchor = child_allocation.y;
break; break;
} }