isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Add a custom scriptable "margin" property

Browse Source 
The property uses an array with the following CSS style syntax

 [ top, right, bottom, left ] or
 [ top, left/right, bottom ] or
 [ top/bottom, left/right ] or
 [ top/right/bottom/left ]

https://bugzilla.gnome.org/show_bug.cgi?id=676367
This commit is contained in:
Bastian Winkler
2012-05-19 14:37:08 +02:00
parent a2d40fcf8c
commit aeea9ee778
5 changed files with 156 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
clutter/clutter-actor.c
View File

@ -383,6 +383,21 @@
* it must contain the center of rotation as described by two coordinates:
* Y and Z for "x-axis"; X and Z for "y-axis"; and X and Y for
* "z-axis".</para>
* <para>#ClutterActor also defines a scriptable "margin" property which
* follows the CSS "margin" shorthand.
* <informalexample>
* <programlisting>
* // 4 values
* "margin" : [ &lt;top&gt;, &lt;right&gt;, &lt;bottom&gt; &lt;left&gt; ]
* // 3 values
* "margin" : [ &lt;top&gt;, &lt;left/right&gt;, &lt;bottom&gt; ]
* // 2 values
* "margin" : [ &lt;top/bottom&gt;, &lt;left/right&gt; ]
* // 1 value
* "margin" : [ &lt;top/right/bottom/left&gt; ]
* </programlisting>
* </informalexample>
* </para>
* <para>#ClutterActor will also parse every positional and dimensional
* property defined as a string through clutter_units_from_string(); you
* should read the documentation for the #ClutterUnits parser format for
@ -13017,6 +13032,63 @@ parse_behaviours (ClutterScript *script,
return g_slist_reverse (retval);
}
static ClutterMargin *
parse_margin (ClutterActor *self,
JsonNode *node)
{
ClutterMargin *margin;
JsonArray *array;
if (!JSON_NODE_HOLDS_ARRAY (node))
{
g_warning ("The margin property must be an array of 1 to 4 elements");
return NULL;
}
margin = clutter_margin_new ();
array = json_node_get_array (node);
switch (json_array_get_length (array))
{
case 1:
margin->top = margin->right = margin->bottom = margin->left =
parse_units (self, 0, json_array_get_element (array, 0));
break;
case 2:
margin->top = margin->bottom =
parse_units (self, 0, json_array_get_element (array, 0));
margin->right = margin->left =
parse_units (self, 0, json_array_get_element (array, 1));
break;
case 3:
margin->top =
parse_units (self, 0, json_array_get_element (array, 0));
margin->right = margin->left =
parse_units (self, 0, json_array_get_element (array, 1));
margin->bottom =
parse_units (self, 0, json_array_get_element (array, 2));
break;
case 4:
margin->top =
parse_units (self, 0, json_array_get_element (array, 0));
margin->right =
parse_units (self, 0, json_array_get_element (array, 1));
margin->bottom =
parse_units (self, 0, json_array_get_element (array, 2));
margin->left =
parse_units (self, 0, json_array_get_element (array, 3));
break;
default:
g_warning ("The margin property must be an array of 1 to 4 elements");
clutter_margin_free (margin);
return NULL;
}
return margin;
}
static gboolean
clutter_actor_parse_custom_node (ClutterScriptable *scriptable,
ClutterScript *script,
@ -13106,6 +13178,17 @@ clutter_actor_parse_custom_node (ClutterScriptable *scriptable,
retval = TRUE;
}
else if (strcmp (name, "margin") == 0)
{
ClutterMargin *margin = parse_margin (actor, node);
if (margin)
{
g_value_init (value, CLUTTER_TYPE_MARGIN);
g_value_set_boxed (value, margin);
retval = TRUE;
}
}
return retval;
}
@ -13198,6 +13281,11 @@ clutter_actor_set_custom_property (ClutterScriptable *scriptable,
return;
}
if (strcmp (name, "margin") == 0)
{
clutter_actor_set_margin (actor, g_value_get_boxed (value));
return;
}
g_object_set_property (G_OBJECT (scriptable), name, value);
}