AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkButton: Set widget state as state flags.

Browse Source
This commit is contained in:
Carlos Garnacho 2010-10-31 14:38:26 +01:00
parent cd98204619
commit 401b655307
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkbutton.c
View File

@ -2291,7 +2291,7 @@ static void
gtk_button_update_state (GtkButton *button)
{
GtkButtonPrivate *priv = button->priv;
GtkStateType new_state;
GtkStateFlags new_state = 0;
gboolean depressed;
if (priv->activate_timeout)
@ -2299,13 +2299,14 @@ gtk_button_update_state (GtkButton *button)
else
depressed = priv->in_button && priv->button_down;
if (priv->in_button && (!priv->button_down || !depressed))
new_state = GTK_STATE_PRELIGHT;
else
new_state = depressed ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL;
if (priv->in_button)
new_state |= GTK_STATE_FLAG_PRELIGHT;
_gtk_button_set_depressed (button, depressed);
gtk_widget_set_state (GTK_WIDGET (button), new_state);
if (priv->button_down || depressed)
new_state |= GTK_STATE_FLAG_ACTIVE;
_gtk_button_set_depressed (button, depressed);
gtk_widget_set_state_flags (GTK_WIDGET (button), new_state, TRUE);
}
static void