AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 15:01:23 +00:00
Code Issues Projects Releases Wiki Activity

Return the list of constraints added via VFL description

Browse Source 
Otherwise it's impossible to remove them.
This commit is contained in:
Emmanuele Bassi 2019-06-30 10:36:33 +01:00
parent 3204347bb0
commit 651adbfb39
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkconstraintlayout.c
View File

@ -1729,9 +1729,10 @@ attribute_from_name (const char *name)
* [button1(==button2.height)] * [button1(==button2.height)]
* ]| * ]|
* *
* Returns: %TRUE if the constraints were added to the layout * Returns: (transfer container) (element-type GtkConstraint): the list of
* #GtkConstraints that were added to the layout
*/ */
gboolean GList *
gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *layout, gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *layout,
const char * const lines[], const char * const lines[],
gsize n_lines, gsize n_lines,
@ -1741,11 +1742,12 @@ gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *la
GError **error) GError **error)
{ {
GtkConstraintVflParser *parser; GtkConstraintVflParser *parser;
GList *res = NULL;
g_return_val_if_fail (GTK_IS_CONSTRAINT_LAYOUT (layout), FALSE); g_return_val_if_fail (GTK_IS_CONSTRAINT_LAYOUT (layout), NULL);
g_return_val_if_fail (lines != NULL, FALSE); g_return_val_if_fail (lines != NULL, NULL);
g_return_val_if_fail (views != NULL, FALSE); g_return_val_if_fail (views != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, NULL);
parser = gtk_constraint_vfl_parser_new (); parser = gtk_constraint_vfl_parser_new ();
gtk_constraint_vfl_parser_set_default_spacing (parser, hspacing, vspacing); gtk_constraint_vfl_parser_set_default_spacing (parser, hspacing, vspacing);
@ -1786,7 +1788,7 @@ gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *la
g_free (squiggly); g_free (squiggly);
g_error_free (internal_error); g_error_free (internal_error);
gtk_constraint_vfl_parser_free (parser); gtk_constraint_vfl_parser_free (parser);
return FALSE; return res;
} }
int n_constraints = 0; int n_constraints = 0;
@ -1820,6 +1822,8 @@ gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *la
layout_add_constraint (layout, constraint); layout_add_constraint (layout, constraint);
g_hash_table_add (layout->constraints, constraint); g_hash_table_add (layout->constraints, constraint);
res = g_list_prepend (res, constraint);
} }
g_free (constraints); g_free (constraints);
@ -1827,7 +1831,7 @@ gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *la
gtk_constraint_vfl_parser_free (parser); gtk_constraint_vfl_parser_free (parser);
return TRUE; return res;
} }
/** /**
@ -1850,9 +1854,10 @@ gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *la
* gtk_constraint_layout_add_constraints_from_descriptionv(), using * gtk_constraint_layout_add_constraints_from_descriptionv(), using
* variadic arguments to populate the view/target map. * variadic arguments to populate the view/target map.
* *
* Returns: %TRUE if the constraints were added to the layout * Returns: (transfer container) (element-type GtkConstraint): the list of
* #GtkConstraints that were added to the layout
*/ */
gboolean GList *
gtk_constraint_layout_add_constraints_from_description (GtkConstraintLayout *layout, gtk_constraint_layout_add_constraints_from_description (GtkConstraintLayout *layout,
const char * const lines[], const char * const lines[],
gsize n_lines, gsize n_lines,
@ -1865,13 +1870,13 @@ gtk_constraint_layout_add_constraints_from_description (GtkConstraintLayout *lay
GtkConstraintVflParser *parser; GtkConstraintVflParser *parser;
GHashTable *views; GHashTable *views;
const char *view; const char *view;
gboolean res; GList *res;
va_list args; va_list args;
g_return_val_if_fail (GTK_IS_CONSTRAINT_LAYOUT (layout), FALSE); g_return_val_if_fail (GTK_IS_CONSTRAINT_LAYOUT (layout), NULL);
g_return_val_if_fail (lines != NULL, FALSE); g_return_val_if_fail (lines != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, NULL);
g_return_val_if_fail (first_view != NULL, FALSE); g_return_val_if_fail (first_view != NULL, NULL);
parser = gtk_constraint_vfl_parser_new (); parser = gtk_constraint_vfl_parser_new ();
gtk_constraint_vfl_parser_set_default_spacing (parser, hspacing, vspacing); gtk_constraint_vfl_parser_set_default_spacing (parser, hspacing, vspacing);

4
gtk/gtkconstraintlayout.h
View File

@ -79,7 +79,7 @@ GDK_AVAILABLE_IN_ALL
void gtk_constraint_layout_remove_all_constraints (GtkConstraintLayout *manager); void gtk_constraint_layout_remove_all_constraints (GtkConstraintLayout *manager);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gtk_constraint_layout_add_constraints_from_description (GtkConstraintLayout *manager, GList * gtk_constraint_layout_add_constraints_from_description (GtkConstraintLayout *manager,
const char * const lines[], const char * const lines[],
gsize n_lines, gsize n_lines,
int hspacing, int hspacing,
@ -88,7 +88,7 @@ gboolean gtk_constraint_layout_add_constraints_from_description
const char *first_view, const char *first_view,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *manager, GList * gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *manager,
const char * const lines[], const char * const lines[],
gsize n_lines, gsize n_lines,
int hspacing, int hspacing,