AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 02:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'just-popover-menu-things' into 'master'

Browse Source 
Post-gizmo GtkPopoverMenu fixes

See merge request GNOME/gtk!264
This commit is contained in:
Timm Bäder 2018-07-23 18:55:55 +00:00
commit 73dd73c859
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkpopovermenu.c
View File

@ -139,7 +139,6 @@ gtk_popover_menu_init (GtkPopoverMenu *popover)
gtk_stack_set_vhomogeneous (GTK_STACK (stack), FALSE);
gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT);
gtk_stack_set_interpolate_size (GTK_STACK (stack), TRUE);
gtk_widget_show (stack);
gtk_container_add (GTK_CONTAINER (popover), stack);
g_signal_connect (stack, "notify::visible-child-name",
G_CALLBACK (visible_submenu_changed), popover);
@ -172,8 +171,7 @@ gtk_popover_menu_add (GtkContainer *container,
if (stack == NULL)
{
gtk_widget_set_parent (child, GTK_WIDGET (container));
_gtk_bin_set_child (GTK_BIN (container), child);
GTK_CONTAINER_CLASS (gtk_popover_menu_parent_class)->add (container, child);
}
else
{

1
tests/popover2.ui
View File

@ -5,7 +5,6 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin">10</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>