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

notebook: fix size requisition for the initial_gap style property

Browse Source 
This is probably going to be replaced by something different soon, but
in the meantime, fix this annoying bug, visible e.g. in widget-factory
for left/right tab examples.
This commit is contained in:
Cosimo Cecchi 2012-05-26 00:42:57 -04:00
parent 2baba250b8
commit 10a4771ae3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtknotebook.c
View File

@ -2033,6 +2033,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook *notebook,
gint tab_overlap;
gint tab_curvature;
gint arrow_spacing;
gint initial_gap;
gint scroll_arrow_hlength;
gint scroll_arrow_vlength;
@ -2042,6 +2043,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook *notebook,
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
"initial-gap", &initial_gap,
"tab-overlap", &tab_overlap,
"tab-curvature", &tab_curvature,
"arrow-spacing", &arrow_spacing,
@ -2145,7 +2147,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook *notebook,
action_width += action_widget_requisition[ACTION_WIDGET_START].width;
action_width += action_widget_requisition[ACTION_WIDGET_END].width;
requisition->width = tab_width + tab_overlap + action_width;
requisition->width = tab_width + tab_overlap + action_width + initial_gap;
requisition->height = tab_height;
break;
@ -2184,7 +2186,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook *notebook,
action_height += action_widget_requisition[ACTION_WIDGET_START].height;
action_height += action_widget_requisition[ACTION_WIDGET_END].height;
requisition->height = tab_height + tab_overlap + action_height;
requisition->height = tab_height + tab_overlap + action_height + initial_gap;
requisition->height = MAX (requisition->height, tab_max + tab_overlap);