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

builder-tool: Convert overlay child properties

Browse Source
This commit is contained in:
Matthias Clasen 2019-03-28 12:21:52 -04:00
parent 866640c0c2
commit fc3cae34ec
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/tools/gtk-builder-tool-simplify.c
View File

@ -200,6 +200,8 @@ keep_for_rewrite (const char *class_name,
{ "GtkToolbar", "homogeneous", 1 },
{ "GtkPaned", "resize", 1 },
{ "GtkPaned", "shrink", 1 },
{ "GtkOverlay", "measure", 1 },
{ "GtkOverlay", "clip-overlay", 1 },
};
gboolean found;
gint k;
@ -253,6 +255,7 @@ is_container_element (Element *element)
*/
const char *names[] = {
"packing",
"layout",
"cell-packing",
"attributes",
"action-widgets",
@ -1068,6 +1071,46 @@ rewrite_paned (Element *element,
rewrite_paned_child (element, data, child2, "child2");
}
static void
rewrite_layout_props (Element *element,
MyParserData *data)
{
GList *l, *ll;
for (l = element->children; l; l = l->next)
{
Element *child = l->data;
if (g_str_equal (child->element_name, "child"))
{
Element *object = NULL;
Element *packing = NULL;
for (ll = child->children; ll; ll = ll->next)
{
Element *elt2 = ll->data;
if (g_str_equal (elt2->element_name, "object"))
object = elt2;
if (g_str_equal (elt2->element_name, "packing"))
packing = elt2;
}
if (object && packing)
{
child->children = g_list_remove (child->children, packing);
g_free (packing->element_name);
packing->element_name = g_strdup ("layout");
packing->parent = object;
object->children = g_list_append (object->children, packing);
}
}
}
}
static gboolean
simplify_element (Element *element,
MyParserData *data)
@ -1139,6 +1182,10 @@ simplify_element (Element *element,
g_str_equal (get_class_name (element), "GtkPaned"))
rewrite_paned (element, data);
if (g_str_equal (element->element_name, "object") &&
g_str_equal (get_class_name (element), "GtkOverlay"))
rewrite_layout_props (element, data);
if (g_str_equal (element->element_name, "property") &&
property_has_been_removed (element, data))
return TRUE;