Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builder: Make <lookup> type optional

Browse Source 
If no type is set, use the type of the expression.
This commit is contained in:
Benjamin Otte
2019-11-25 08:01:31 +01:00
parent 90277fba71
commit 1c354586d0
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/gtkbuilderparser.c
View File

@@ -1144,7 +1144,7 @@ parse_lookup_expression (ParserData *data,
{
ExpressionInfo *info;
const char *property_name;
const char *type_name;
const char *type_name = NULL;
GType type;
if (!check_expression_parent (data))
@@ -1154,7 +1154,7 @@ parse_lookup_expression (ParserData *data,
}
if (!g_markup_collect_attributes (element_name, names, values, error,
G_MARKUP_COLLECT_STRING, "type", &type_name,
G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "type", &type_name,
G_MARKUP_COLLECT_STRING, "name", &property_name,
G_MARKUP_COLLECT_INVALID))
{
@@ -1162,15 +1162,22 @@ parse_lookup_expression (ParserData *data,
return;
}
type = gtk_builder_get_type_from_name (data->builder, type_name);
if (type == G_TYPE_INVALID)
if (type_name == NULL)
{
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Invalid type '%s'", type_name);
_gtk_builder_prefix_error (data->builder, &data->ctx, error);
return;
type = G_TYPE_INVALID;
}
else
{
type = gtk_builder_get_type_from_name (data->builder, type_name);
if (type == G_TYPE_INVALID)
{
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Invalid type '%s'", type_name);
_gtk_builder_prefix_error (data->builder, &data->ctx, error);
return;
}
}
info = g_slice_new0 (ExpressionInfo);
@@ -1264,6 +1271,7 @@ expression_info_construct (GtkBuilder *builder,
case EXPRESSION_PROPERTY:
{
GtkExpression *expression;
GType type;
if (info->property.expression)
{
@@ -1275,7 +1283,20 @@ expression_info_construct (GtkBuilder *builder,
else
expression = NULL;
expression = gtk_property_expression_new (info->property.this_type,
if (info->property.this_type != G_TYPE_INVALID)
type = info->property.this_type;
else if (expression != NULL)
type = gtk_expression_get_value_type (expression);
else
{
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
"%s:%d:%d Lookups require a type attribute if they don't have an expression.",
"???", 0, 0);
return NULL;
}
expression = gtk_property_expression_new (type,
expression,
info->property.property_name);
g_free (info->property.property_name);