[gtk+] button: don't read focus padding property
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] button: don't read focus padding property
- Date: Fri, 9 May 2014 18:06:10 +0000 (UTC)
commit 8b068e996f906775269abe776bf4248a936c66cc
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu May 1 20:13:47 2014 +0200
button: don't read focus padding property
We're going to deprecate it.
gtk/gtkbutton.c | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 19a1436..f9aba7a 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1696,7 +1696,7 @@ gtk_button_get_full_border (GtkButton *button,
GtkWidget *widget = GTK_WIDGET (button);
GtkStyleContext *context;
GtkBorder default_border, padding, border;
- int focus_width, focus_pad;
+ int focus_width;
context = gtk_widget_get_style_context (widget);
@@ -1704,13 +1704,12 @@ gtk_button_get_full_border (GtkButton *button,
&padding, &border);
gtk_style_context_get_style (context,
"focus-line-width", &focus_width,
- "focus-padding", &focus_pad,
NULL);
- full_border->left = padding.left + border.left + focus_width + focus_pad;
- full_border->right = padding.right + border.right + focus_width + focus_pad;
- full_border->top = padding.top + border.top + focus_width + focus_pad;
- full_border->bottom = padding.bottom + border.bottom + focus_width + focus_pad;
+ full_border->left = padding.left + border.left + focus_width;
+ full_border->right = padding.right + border.right + focus_width;
+ full_border->top = padding.top + border.top + focus_width;
+ full_border->bottom = padding.bottom + border.bottom + focus_width;
if (gtk_widget_get_can_default (GTK_WIDGET (button)))
{
@@ -1788,7 +1787,6 @@ gtk_button_draw (GtkWidget *widget,
GtkBorder default_border;
GtkBorder default_outside_border;
gint focus_width;
- gint focus_pad;
GtkAllocation allocation;
GtkStyleContext *context;
GtkStateFlags state;
@@ -1801,7 +1799,6 @@ gtk_button_draw (GtkWidget *widget,
gtk_button_get_props (button, &default_border, &default_outside_border, NULL, NULL);
gtk_style_context_get_style (context,
"focus-line-width", &focus_width,
- "focus-padding", &focus_pad,
NULL);
gtk_widget_get_allocation (widget, &allocation);
@@ -1852,10 +1849,10 @@ gtk_button_draw (GtkWidget *widget,
NULL);
gtk_style_context_get_border (context, state, &border);
- x += border.left + focus_pad;
- y += border.top + focus_pad;
- width -= (2 * focus_pad) + border.left + border.right;
- height -= (2 * focus_pad) + border.top + border.bottom;
+ x += border.left;
+ y += border.top;
+ width -= border.left + border.right;
+ height -= border.top + border.bottom;
if (priv->depressed && displace_focus)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]