[gtk+] checkbutton: Don't redundantly update states
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] checkbutton: Don't redundantly update states
- Date: Sun, 17 Aug 2014 01:21:22 +0000 (UTC)
commit d36bba293d9a169b87ff07d059db7b3897f400a2
Author: Benjamin Otte <otte redhat com>
Date: Sun Aug 17 03:19:59 2014 +0200
checkbutton: Don't redundantly update states
States are set properly by GtkButton, there is no need to set them
manually.
gtk/gtkcheckbutton.c | 12 ------------
gtk/gtkradiobutton.c | 13 -------------
2 files changed, 0 insertions(+), 25 deletions(-)
---
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 08c2260..47dc6bb 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -529,7 +529,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
{
GtkWidget *widget;
GtkButton *button;
- GtkStateFlags state = 0;
gint x, y;
gint indicator_size;
gint indicator_spacing;
@@ -544,7 +543,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
gtk_widget_get_allocation (widget, &allocation);
baseline = gtk_widget_get_allocated_baseline (widget);
context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
_gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
@@ -557,20 +555,10 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
y = CLAMP (baseline - indicator_size * button->priv->baseline_align,
0, allocation.height - indicator_size);
- state &= ~(GTK_STATE_FLAG_ACTIVE |
- GTK_STATE_FLAG_PRELIGHT);
-
- if (button->priv->activate_timeout || (button->priv->button_down && button->priv->in_button))
- state |= GTK_STATE_FLAG_ACTIVE;
-
- if (button->priv->in_button)
- state |= GTK_STATE_FLAG_PRELIGHT;
-
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
x = allocation.width - (indicator_size + x);
gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
gtk_render_background (context, cr,
border_width, border_width,
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 69aab76..f61a361 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -831,7 +831,6 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
GtkWidget *widget;
GtkButton *button;
GtkStyleContext *context;
- GtkStateFlags state = 0;
gint x, y;
gint indicator_size, indicator_spacing;
gint baseline;
@@ -840,7 +839,6 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
widget = GTK_WIDGET (check_button);
button = GTK_BUTTON (check_button);
context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
_gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
@@ -855,21 +853,10 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
y = CLAMP (baseline - indicator_size * button->priv->baseline_align,
0, allocation.height - indicator_size);
- state &= ~(GTK_STATE_FLAG_ACTIVE |
- GTK_STATE_FLAG_PRELIGHT);
-
- if (button->priv->activate_timeout ||
- (button->priv->button_down && button->priv->in_button))
- state |= GTK_STATE_FLAG_ACTIVE;
-
- if (button->priv->in_button)
- state |= GTK_STATE_FLAG_PRELIGHT;
-
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
x = allocation.width - (indicator_size + x);
gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
gtk_render_background (context, cr,
border_width, border_width,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]