brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[StButton] Cleanup left-over animation code

Browse Source 
StButton used to animate hover changes - the animation itself was
removed in commit a4481b38d, but some related member variables were
left in place.
This commit is contained in:
Florian Müllner 2010-06-20 03:40:54 +02:00
parent ee79579b2e
commit 04ecde9f8e
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/st/st-button.c
View File

@ -54,8 +54,7 @@ enum
PROP_LABEL, PROP_LABEL,
PROP_TOGGLE_MODE, PROP_TOGGLE_MODE,
PROP_CHECKED, PROP_CHECKED
PROP_TRANSITION_DURATION
}; };
enum enum
@ -72,17 +71,11 @@ struct _StButtonPrivate
{ {
gchar *text; gchar *text;
guint8 old_opacity;
guint is_pressed : 1; guint is_pressed : 1;
guint is_hover : 1; guint is_hover : 1;
guint is_checked : 1; guint is_checked : 1;
guint is_toggle : 1; guint is_toggle : 1;
gint transition_duration;
ClutterAnimation *animation;
gint spacing; gint spacing;
}; };
@ -242,7 +235,6 @@ st_button_set_property (GObject *gobject,
GParamSpec *pspec) GParamSpec *pspec)
{ {
StButton *button = ST_BUTTON (gobject); StButton *button = ST_BUTTON (gobject);
StButtonPrivate *priv = ST_BUTTON (gobject)->priv;
switch (prop_id) switch (prop_id)
{ {
@ -255,9 +247,6 @@ st_button_set_property (GObject *gobject,
case PROP_CHECKED: case PROP_CHECKED:
st_button_set_checked (button, g_value_get_boolean (value)); st_button_set_checked (button, g_value_get_boolean (value));
break; break;
case PROP_TRANSITION_DURATION:
priv->transition_duration = g_value_get_int (value);
break;
default: default:
@ -285,9 +274,6 @@ st_button_get_property (GObject *gobject,
case PROP_CHECKED: case PROP_CHECKED:
g_value_set_boolean (value, priv->is_checked); g_value_set_boolean (value, priv->is_checked);
break; break;
case PROP_TRANSITION_DURATION:
g_value_set_int (value, priv->transition_duration);
break;
default: default:
@ -349,12 +335,6 @@ st_button_class_init (StButtonClass *klass)
FALSE, G_PARAM_READWRITE); FALSE, G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_CHECKED, pspec); g_object_class_install_property (gobject_class, PROP_CHECKED, pspec);
pspec = g_param_spec_int ("transition-duration",
"Transition Duration",
"Duration of the state transition effect",
0, G_MAXINT, 120, G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TRANSITION_DURATION, pspec);
/** /**
* StButton::clicked: * StButton::clicked:
@ -378,7 +358,6 @@ static void
st_button_init (StButton *button) st_button_init (StButton *button)
{ {
button->priv = ST_BUTTON_GET_PRIVATE (button); button->priv = ST_BUTTON_GET_PRIVATE (button);
button->priv->transition_duration = 120;
button->priv->spacing = 6; button->priv->spacing = 6;
clutter_actor_set_reactive ((ClutterActor *) button, TRUE); clutter_actor_set_reactive ((ClutterActor *) button, TRUE);