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

Revert part of "gtknotebook: Optimize GtkStyleContext usage"

Browse Source 
This reverts part of commit c71e213134.
This part was unfinished and was pushed simply to avoid the warnings.
This commit is contained in:
Jasper St. Pierre 2014-11-25 11:21:21 -08:00
parent eba317228f
commit a78b18c565
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtknotebook.c
View File

@ -6249,7 +6249,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
if (page != priv->cur_page) if (page != priv->cur_page)
{ {
GtkBorder padding = {}; GtkBorder active_padding, normal_padding, padding;
/* The active tab is by definition at least the same height as the inactive one. /* The active tab is by definition at least the same height as the inactive one.
* The padding we're building is the offset between the two tab states, * The padding we're building is the offset between the two tab states,
@ -6261,11 +6261,16 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
gtk_style_context_save (context); gtk_style_context_save (context);
notebook_tab_prepare_style_context (notebook, page, context, TRUE); notebook_tab_prepare_style_context (notebook, page, context, TRUE);
/* gtk_style_context_get_padding (context, GTK_STATE_FLAG_ACTIVE, &active_padding); */ gtk_style_context_get_padding (context, GTK_STATE_FLAG_ACTIVE, &active_padding);
/* gtk_style_context_get_padding (context, GTK_STATE_FLAG_NORMAL, &normal_padding); */ gtk_style_context_get_padding (context, GTK_STATE_FLAG_NORMAL, &normal_padding);
gtk_style_context_restore (context); gtk_style_context_restore (context);
padding.top = MAX (0, active_padding.top - normal_padding.top);
padding.right = MAX (0, active_padding.right - normal_padding.right);
padding.bottom = MAX (0, active_padding.bottom - normal_padding.bottom);
padding.left = MAX (0, active_padding.left - normal_padding.left);
switch (tab_pos) switch (tab_pos)
{ {
case GTK_POS_TOP: case GTK_POS_TOP: