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

checkbutton: support CSS paddings and borders

Browse Source 
We need this since we just removed focus-padding.
This commit is contained in:
Cosimo Cecchi 2014-05-02 01:40:26 +02:00
parent 99f0776f19
commit c20e8b0b49
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkcheckbutton.c
View File

@ -254,6 +254,25 @@ _gtk_check_button_get_props (GtkCheckButton *check_button,
gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL); gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL);
} }
static void
get_padding_and_border (GtkWidget *widget,
GtkBorder *border)
{
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder tmp;
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
gtk_style_context_get_padding (context, state, border);
gtk_style_context_get_border (context, state, &tmp);
border->top += tmp.top;
border->right += tmp.right;
border->bottom += tmp.bottom;
border->left += tmp.left;
}
static void static void
gtk_check_button_get_full_border (GtkCheckButton *check_button, gtk_check_button_get_full_border (GtkCheckButton *check_button,
GtkBorder *border, GtkBorder *border,
@ -262,6 +281,7 @@ gtk_check_button_get_full_border (GtkCheckButton *check_button,
int focus_width, indicator_size, indicator_spacing, indicator_extra, border_width; int focus_width, indicator_size, indicator_spacing, indicator_extra, border_width;
GtkWidget *child; GtkWidget *child;
get_padding_and_border (GTK_WIDGET (check_button), border);
border_width = gtk_container_get_border_width (GTK_CONTAINER (check_button)); border_width = gtk_container_get_border_width (GTK_CONTAINER (check_button));
gtk_widget_style_get (GTK_WIDGET (check_button), gtk_widget_style_get (GTK_WIDGET (check_button),
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
@ -270,10 +290,10 @@ gtk_check_button_get_full_border (GtkCheckButton *check_button,
NULL); NULL);
child = gtk_bin_get_child (GTK_BIN (check_button)); child = gtk_bin_get_child (GTK_BIN (check_button));
border->left = border_width + focus_width; border->left += border_width + focus_width;
border->right = border_width + focus_width; border->right += border_width + focus_width;
border->top = border_width + focus_width; border->top += border_width + focus_width;
border->bottom = border_width + focus_width; border->bottom += border_width + focus_width;
indicator_extra = indicator_size + 2 * indicator_spacing; indicator_extra = indicator_size + 2 * indicator_spacing;
if (child && gtk_widget_get_visible (child)) if (child && gtk_widget_get_visible (child))