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

notebook: fixup the last commit

Browse Source 
Let the tab overlap eat the padding, otherwise having tab-overlap >
tab-curvature without cutting the label is impossible.
This way we give the label widget all the allocation possible before
giving up and cutting it if the values for tab-overlap are too extreme
for the given padding.
This commit is contained in:
Cosimo Cecchi 2011-03-06 22:04:13 -05:00
parent da814ae767
commit a54ca77fb7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtknotebook.c
View File

@ -6065,13 +6065,18 @@ gtk_notebook_page_allocate (GtkNotebook *notebook,
* coordinate of the allocation too, to position it after
* the end of the overlap.
*/
if (page != priv->cur_page && tab_overlap > tab_curvature)
if (page != priv->cur_page && tab_overlap > tab_curvature + MIN (tab_padding.left, tab_padding.right))
{
child_allocation.width -= tab_overlap - tab_curvature;
if (gtk_notebook_page_num (notebook, page->child) >
gtk_notebook_page_num (notebook, priv->cur_page->child))
child_allocation.x += tab_overlap - tab_curvature;
{
child_allocation.x += tab_overlap - tab_curvature - tab_padding.left;
child_allocation.width -= tab_overlap - tab_curvature - tab_padding.left;
}
else
{
child_allocation.width -= tab_overlap - tab_curvature - tab_padding.right;
}
}
}
else