diff options
| author | Timm Bäder <mail@baedert.org> | 2018-07-23 18:55:55 +0000 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2018-07-23 18:55:55 +0000 |
| commit | 73dd73c859b01b64f427e264e86d0e29fd159fcb (patch) | |
| tree | a4b83635313030b3dbea360f8641364e464dfa01 | |
| parent | bbf5d142b37e07114218b099832b7bfbef8b3add (diff) | |
| parent | 1fbbaef49e5b76d57b38361b586c6898cff27542 (diff) | |
| download | gtk+-73dd73c859b01b64f427e264e86d0e29fd159fcb.tar.gz | |
Merge branch 'just-popover-menu-things' into 'master'
Post-gizmo GtkPopoverMenu fixes
See merge request GNOME/gtk!264
| -rw-r--r-- | gtk/gtkpopovermenu.c | 4 | ||||
| -rw-r--r-- | tests/popover2.ui | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c index bb08b3efed..9f6f5564c5 100644 --- a/gtk/gtkpopovermenu.c +++ b/gtk/gtkpopovermenu.c @@ -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 { diff --git a/tests/popover2.ui b/tests/popover2.ui index 5ab488cdb2..2e406fb751 100644 --- a/tests/popover2.ui +++ b/tests/popover2.ui @@ -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> |