[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Nov 20 20:07:00 UTC 2020


 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df0c70d52ccc7e9a7c453d758ef210735f513082
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 20 14:02:52 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 20 21:06:18 2020 +0100

    GtkWindow case is similar to GtkPopover case
    
    Change-Id: Ie7417efd4113851615ee1c17a1297017a49a992d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106268
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 67839fc77f79..47da0859e962 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -16693,7 +16693,7 @@ public:
     //gtk impl emulate this by doing this implicitly at weld time
     void auto_add_parentless_widgets_to_container(GtkWidget* pWidget)
     {
-        if (gtk_widget_get_toplevel(pWidget) == pWidget && !GTK_IS_POPOVER(pWidget))
+        if (gtk_widget_get_toplevel(pWidget) == pWidget && !GTK_IS_POPOVER(pWidget) && !GTK_IS_WINDOW(pWidget))
             gtk_container_add(GTK_CONTAINER(m_pParentWidget), pWidget);
     }
 


More information about the Libreoffice-commits mailing list