summaryrefslogtreecommitdiff
path: root/gtk/gtkmodelbutton.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2014-05-04 20:38:24 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2014-05-09 11:02:46 -0700
commitcaa73b21285765dac484937cdbb1ff10286aeb68 (patch)
tree9b5da688cacdf8e52e16732c3e7037f7063cb6db /gtk/gtkmodelbutton.c
parente2f2571dee2efac4b9f3fa9a5da54bbfe5ef0f43 (diff)
downloadgtk+-caa73b21285765dac484937cdbb1ff10286aeb68.tar.gz
modelbutton: don't use focus-line-width
Diffstat (limited to 'gtk/gtkmodelbutton.c')
-rw-r--r--gtk/gtkmodelbutton.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 291a50e78c..c70be468b1 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -245,22 +245,18 @@ gtk_model_button_get_full_border (GtkModelButton *button,
GtkBorder *border,
gint *indicator)
{
- gint focus_width;
gint indicator_size, indicator_spacing;
gint border_width;
border_width = gtk_container_get_border_width (GTK_CONTAINER (button));
- gtk_widget_style_get (GTK_WIDGET (button),
- "focus-line-width", &focus_width,
- NULL);
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &indicator_size, NULL);
indicator_spacing = indicator_size / 8;
- border->left = border_width + focus_width;
- border->right = border_width + focus_width;
- border->top = border_width + focus_width;
- border->bottom = border_width + focus_width;
+ border->left = border_width;
+ border->right = border_width;
+ border->top = border_width;
+ border->bottom = border_width;
if (button->iconic)
*indicator = 0;
@@ -579,7 +575,6 @@ gtk_model_button_draw (GtkWidget *widget,
gint x, y;
gint width, height;
gint indicator_size, indicator_spacing;
- gint focus_width;
gint baseline;
state = get_button_state (model_button);
@@ -599,14 +594,10 @@ gtk_model_button_draw (GtkWidget *widget,
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
baseline = gtk_widget_get_allocated_baseline (widget);
- gtk_widget_style_get (widget,
- "focus-line-width", &focus_width,
- NULL);
-
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &indicator_size, NULL);
indicator_spacing = indicator_size / 8;
- x = width - border_width - focus_width - indicator_spacing - indicator_size;
+ x = width - border_width - indicator_spacing - indicator_size;
if (indicator_is_left (widget))
x = width - (indicator_size + x);