diff options
author | Benjamin Otte <otte@redhat.com> | 2014-08-17 03:19:59 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2014-08-17 03:19:59 +0200 |
commit | d36bba293d9a169b87ff07d059db7b3897f400a2 (patch) | |
tree | ac62e504769c024dd5ec93ce2511fd3002d6110f /gtk/gtkradiobutton.c | |
parent | c1a063e1a43b20fe516b044e3a6a43812d7dd18b (diff) | |
download | gtk+-d36bba293d9a169b87ff07d059db7b3897f400a2.tar.gz |
checkbutton: Don't redundantly update states
States are set properly by GtkButton, there is no need to set them
manually.
Diffstat (limited to 'gtk/gtkradiobutton.c')
-rw-r--r-- | gtk/gtkradiobutton.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 69aab76f54..f61a361e15 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, |