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

Improve GtkNotbook behaviour with too little space

Browse Source 
This fixes bug 582488. The patch was provided by Morten Welinder.
This commit is contained in:
Matthias Clasen
2009-05-17 23:43:26 -04:00
parent f64ef8ea51
commit 122e0b40ba
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtknotebook.c
View File

@ -4981,12 +4981,15 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
remaining_space, STEP_NEXT); remaining_space, STEP_NEXT);
} }
if (*remaining_space <= 0) if (tab_space <= 0 || *remaining_space < 0)
{ {
/* show 1 tab */ /* show 1 tab */
notebook->first_tab = notebook->focus_tab; notebook->first_tab = notebook->focus_tab;
*last_child = gtk_notebook_search_page (notebook, notebook->focus_tab, *last_child = gtk_notebook_search_page (notebook, notebook->focus_tab,
STEP_NEXT, TRUE); STEP_NEXT, TRUE);
page = notebook->first_tab->data;
*remaining_space = tab_space - page->requisition.width;
*n = 1;
} }
else else
{ {
@ -5073,7 +5076,6 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
TRUE); TRUE);
} }
} }
}
if (*remaining_space < 0) if (*remaining_space < 0)
{ {
@ -5089,6 +5091,7 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
} }
else else
*remaining_space = 0; *remaining_space = 0;
}
/* unmap all non-visible tabs */ /* unmap all non-visible tabs */
for (children = gtk_notebook_search_page (notebook, NULL, for (children = gtk_notebook_search_page (notebook, NULL,