isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-05 10:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-11-28 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
Remove the layout containers: they will be moved to a
	high-level library.

	* clutter/clutter.h:
	* clutter/Makefile.am: Remove layout and boxes from the
	build.

	* clutter/clutter-layout.[ch]: Remove the ClutterLayout
	interface.
	
	* clutter/clutter-box.[ch]:
	* clutter/clutter-hbox.[ch]:
	* clutter/clutter-vbox.[ch]: Remove ClutterBox and its
	subclasses.
	
	* clutter/clutter-label.c: Remove ClutterLayout implementation

	* clutter/clutter-script-private.h:
	* clutter/clutter-script-parser.c:
	* clutter/clutter-script.c:
	(clutter_script_parse_node): Remove special parsing for
	ClutterMargin and ClutterPadding.

	* clutter/clutter-types.h: Remove ClutterPadding and ClutterMargin.

	* tests/Makefile.am:
	* tests/test-boxes.c: Remove the boxes test case.
This commit is contained in:
Emmanuele Bassi
2007-11-28 13:50:24 +00:00
parent 20a9bf142c
commit 4976be12ca
21 changed files with 43 additions and 2578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
clutter/clutter-script-parser.c
View File

@ -264,129 +264,6 @@ clutter_script_parse_knot (ClutterScript *script,
return FALSE;
}
static ClutterUnit
get_units_from_node (JsonNode *node)
{
ClutterUnit retval = 0;
GValue value = { 0, };
if (JSON_NODE_TYPE (node) != JSON_NODE_VALUE)
return 0;
json_node_get_value (node, &value);
switch (G_VALUE_TYPE (&value))
{
case G_TYPE_INT:
retval = CLUTTER_UNITS_FROM_INT (g_value_get_int (&value));
break;
default:
break;
}
g_value_unset (&value);
return retval;
}
gboolean
clutter_script_parse_padding (ClutterScript *script,
JsonNode *node,
ClutterPadding *padding)
{
JsonArray *array;
gint array_len, i;
g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
g_return_val_if_fail (padding != NULL, FALSE);
if (JSON_NODE_TYPE (node) != JSON_NODE_ARRAY)
return FALSE;
array = json_node_get_array (node);
array_len = json_array_get_length (array);
for (i = 0; i < array_len; i++)
{
JsonNode *val = json_array_get_element (array, i);
ClutterUnit units = get_units_from_node (val);
switch (i)
{
case 0:
padding->top = units;
padding->right = padding->top;
padding->bottom = padding->top;
padding->left = padding->top;
break;
case 1:
padding->right = padding->left = units;
break;
case 2:
padding->bottom = units;
break;
case 3:
padding->left = units;
break;
}
}
return TRUE;
}
gboolean
clutter_script_parse_margin (ClutterScript *script,
JsonNode *node,
ClutterMargin *margin)
{
JsonArray *array;
gint array_len, i;
g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
g_return_val_if_fail (margin != NULL, FALSE);
if (JSON_NODE_TYPE (node) != JSON_NODE_ARRAY)
return FALSE;
array = json_node_get_array (node);
array_len = json_array_get_length (array);
for (i = 0; i < array_len; i++)
{
JsonNode *val = json_array_get_element (array, i);
ClutterUnit units = get_units_from_node (val);
switch (i)
{
case 0:
margin->top = units;
margin->right = margin->top;
margin->bottom = margin->top;
margin->left = margin->top;
break;
case 1:
margin->right = margin->left = units;
break;
case 2:
margin->bottom = units;
break;
case 3:
margin->left = units;
break;
}
}
return TRUE;
}
static gboolean
parse_geometry_from_array (JsonArray *array,
ClutterGeometry *geometry)