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

Merge branch 'simplify-toolbar' into 'master'

Browse Source 
3to4: Remove GtkToolbar::toolbar_style

See merge request GNOME/gtk!3040
This commit is contained in:
Matthias Clasen 2021-01-05 19:35:46 +00:00
commit 6e8e467cc9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/tools/gtk-builder-tool-simplify.c
View File

@ -1723,6 +1723,20 @@ rewrite_toolbar (Element *element,
set_attribute_value (element, "class", "GtkBox");
for (l = element->children; l; l = l->next)
{
Element *child = l->data;
if (g_str_equal (child->element_name, "property") &&
(has_attribute (child, "name", "toolbar_style") ||
has_attribute (child, "name", "toolbar-style")))
{
element->children = g_list_remove (element->children, child);
free_element (child);
break;
}
}
for (l = element->children; l; l = l->next)
{
Element *child = l->data;

1
testsuite/tools/simplify-data-3to4/toolbar.ui
View File

@ -3,6 +3,7 @@
<requires lib="gtk+" version="3.0"/>
<object class="GtkToolbar">
<property name="visible">1</property>
<property name="toolbar_style">both</property>
<child>
<object class="GtkToolButton">
<property name="visible">1</property>