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

builderparser: Allow bind-source without bind-property

Browse Source 
This allow users to bind same property of two objects with only
specifing “name” and “bind-source” in UI file.

Fixes https://gitlab.gnome.org/GNOME/gtk/issues/2080
This commit is contained in:
Mohammed Sadiq 2019-08-07 07:42:03 +05:30
parent 120cfcc120
commit c1bb699151
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkbuilder.c
View File

@ -131,9 +131,9 @@
*
* It is also possible to bind a property value to another object's
* property value using the attributes
* "bind-source" to specify the source object of the binding,
* "bind-property" to specify the source property and optionally
* "bind-flags" to specify the binding flags
* "bind-source" to specify the source object of the binding, and
* optionally, "bind-property" and "bind-flags" to specify the
* source property and source binding flags respectively.
* Internally builder implement this using GBinding objects.
* For more information see g_object_bind_property()
*

10
gtk/gtkbuilderparser.c
View File

@ -598,7 +598,7 @@ parse_property (ParserData *data,
g_markup_parse_context_get_position (data->ctx, &line, &col);
if (bind_source && bind_property)
if (bind_source)
{
BindingInfo *binfo;
@ -606,17 +606,17 @@ parse_property (ParserData *data,
binfo->target = NULL;
binfo->target_pspec = pspec;
binfo->source = g_strdup (bind_source);
binfo->source_property = g_strdup (bind_property);
binfo->source_property = bind_property ? g_strdup (bind_property) : g_strdup (name);
binfo->flags = bind_flags;
binfo->line = line;
binfo->col = col;
object_info->bindings = g_slist_prepend (object_info->bindings, binfo);
}
else if (bind_source || bind_property)
else if (bind_property)
{
error_missing_attribute (data, element_name,
(bind_source) ? "bind-property" : "bind-source",
"bind-source",
error);
return;
}
@ -626,7 +626,7 @@ parse_property (ParserData *data,
info->pspec = pspec;
info->text = g_string_new ("");
info->translatable = translatable;
info->bound = (bind_source && bind_property);
info->bound = bind_source != NULL;
info->context = g_strdup (context);
info->line = line;
info->col = col;

8
gtk/tools/gtk4builder.rng
View File

@ -103,9 +103,11 @@
<attribute name="bind-source">
<text/>
</attribute>
<attribute name="bind-property">
<text/>
</attribute>
<optional>
<attribute name="bind-property">
<text/>
</attribute>
</optional>
<optional>
<attribute name="bind-flags">
<text/>