[gtk+/wip/focusprops: 44/48] modelbutton: don't use focus-line-width



commit 13fbb8d33ee9c992011c451d53b1a4720af5f4b4
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun May 4 20:38:24 2014 +0200

    modelbutton: don't use focus-line-width

 gtk/gtkmodelbutton.c |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 291a50e..c70be46 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]