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

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
layoutmanager: Fix the child-widget property

Closes #3080

See merge request GNOME/gtk!2460
This commit is contained in:
Matthias Clasen 2020-08-21 20:45:53 +00:00
commit ab5e62ddab
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/widget-factory/widget-factory.ui
View File

@ -3140,6 +3140,7 @@ bad things might happen.</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<layout> <layout>
<property name="row">1</property> <property name="row">1</property>
<property name="column">0</property>
</layout> </layout>
</object> </object>
</child> </child>
@ -3166,6 +3167,7 @@ bad things might happen.</property>
<object class="GtkEntry" id="open_popover_entry"> <object class="GtkEntry" id="open_popover_entry">
<property name="activates-default">1</property> <property name="activates-default">1</property>
<layout> <layout>
<property name="row">0</property>
<property name="column">1</property> <property name="column">1</property>
<property name="column-span">2</property> <property name="column-span">2</property>
</layout> </layout>

2
gtk/gtklayoutmanager.c
View File

@ -195,7 +195,7 @@ gtk_layout_manager_real_create_layout_child (GtkLayoutManager *manager,
return g_object_new (manager_class->layout_child_type, return g_object_new (manager_class->layout_child_type,
"layout-manager", manager, "layout-manager", manager,
"child-widget", widget, "child-widget", child,
NULL); NULL);
} }