isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-31 15:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

state: add a duration property

Browse Source 
Adding a duration property to ClutterState allows the json parsing
to parse the default transition duration with the generic code paths.
This commit is contained in:
Øyvind Kolås 2010-06-16 17:33:48 +01:00
parent 351b6c0543
commit 52d2e7d25d
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-state.c
View File

@ -114,6 +114,7 @@ typedef struct _ClutterStateKey
enum enum
{ {
PROP_0, PROP_0,
PROP_DURATION,
PROP_TARGET_STATE PROP_TARGET_STATE
}; };
@ -1061,6 +1062,9 @@ clutter_state_set_property (GObject *object,
case PROP_TARGET_STATE: case PROP_TARGET_STATE:
clutter_state_change (state, g_value_get_string (value), TRUE); clutter_state_change (state, g_value_get_string (value), TRUE);
break; break;
case PROP_DURATION:
state->priv->duration = g_value_get_uint (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
} }
@ -1079,6 +1083,9 @@ clutter_state_get_property (GObject *object,
g_value_set_string (value, g_value_set_string (value,
clutter_state_get_target_state (state)); clutter_state_get_target_state (state));
break; break;
case PROP_DURATION:
g_value_set_uint (value, state->priv->duration);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
} }
@ -1128,6 +1135,19 @@ clutter_state_class_init (ClutterStateClass *klass)
"default", "default",
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TARGET_STATE, pspec); g_object_class_install_property (gobject_class, PROP_TARGET_STATE, pspec);
/**
* ClutterState:duration:
*
* Default duration used if an duration has not been specified for a specific
* source/target state pair. The values is in milliseconds.
*/
pspec = g_param_spec_uint ("duration",
"Duration",
"Default transition duration",
0, 86400000, 1000,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_DURATION, pspec);
} }
static void static void