AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

constraintlayout: Fix parsing from ui file

Browse Source 
Guides were not properly looked up when creating
constraints in a ui file.
This commit is contained in:
Matthias Clasen 2020-10-30 00:23:45 -04:00
parent 49bdc4f0c2
commit b8f44de48e
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/gtkconstraintlayout.c
View File

@ -103,6 +103,8 @@
* The "source" and "target" attributes can be set to "super" to indicate
* that the constraint target is the widget using the GtkConstraintLayout.
*
* There can be "constant" and "multiplier" attributes.
*
* Additionally, the "constraints" element can also contain a description
* of the #GtkConstraintGuides used by the layout:
*
@ -1327,6 +1329,7 @@ parse_int (const char *string,
static GtkConstraint *
constraint_data_to_constraint (const ConstraintData *data,
GtkBuilder *builder,
GHashTable *guides,
GError **error)
{
gpointer source, target;
@ -1350,13 +1353,30 @@ constraint_data_to_constraint (const ConstraintData *data,
source = NULL;
}
else
source = gtk_builder_get_object (builder, data->source_name);
{
if (g_hash_table_contains (guides, data->source_name))
source = g_hash_table_lookup (guides, data->source_name);
else
source = gtk_builder_get_object (builder, data->source_name);
if (source == NULL)
{
g_set_error (error, GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Unable to find source '%s' for constraint",
data->source_name);
return NULL;
}
}
if (g_strcmp0 (data->target_name, "super") == 0)
target = NULL;
else
{
target = gtk_builder_get_object (builder, data->target_name);
if (g_hash_table_contains (guides, data->target_name))
target = g_hash_table_lookup (guides, data->target_name);
else
target = gtk_builder_get_object (builder, data->target_name);
if (target == NULL)
{
@ -1623,6 +1643,9 @@ gtk_constraint_layout_custom_finished (GtkBuildable *buildable,
if (strcmp (element_name, "constraints") == 0)
{
GList *l;
GHashTable *guides;
guides = g_hash_table_new (g_str_hash, g_str_equal);
data->guides = g_list_reverse (data->guides);
for (l = data->guides; l != NULL; l = l->next)
@ -1630,16 +1653,25 @@ gtk_constraint_layout_custom_finished (GtkBuildable *buildable,
const GuideData *gdata = l->data;
GtkConstraintGuide *g;
GError *error = NULL;
const char *name;
g = guide_data_to_guide (gdata, builder, &error);
if (error != NULL)
{
g_critical ("Unable to parse guide definition: %s",
error->message);
g_critical ("Unable to parse guide definition: %s", error->message);
g_error_free (error);
continue;
}
name = gtk_constraint_guide_get_name (g);
if (g_hash_table_lookup (guides, name))
{
g_critical ("Duplicate guide: %s", name);
g_object_unref (g);
continue;
}
g_hash_table_insert (guides, (gpointer)name, g);
gtk_constraint_layout_add_guide (data->layout, g);
}
@ -1650,7 +1682,7 @@ gtk_constraint_layout_custom_finished (GtkBuildable *buildable,
GtkConstraint *c;
GError *error = NULL;
c = constraint_data_to_constraint (cdata, builder, &error);
c = constraint_data_to_constraint (cdata, builder, guides, &error);
if (error != NULL)
{
g_critical ("Unable to parse constraint definition '%s.%s [%s] %s.%s * %g + %g': %s",
@ -1671,6 +1703,8 @@ gtk_constraint_layout_custom_finished (GtkBuildable *buildable,
g_list_free_full (data->guides, guide_data_free);
g_object_unref (data->layout);
g_free (data);
g_hash_table_unref (guides);
}
}