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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx  |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 15521912ccbba14fe5f5b91009bfec154c7f29a1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 20 15:41:31 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 20 21:23:08 2019 +0200

    expand to fill VclBin
    
    Change-Id: If40894e9b92f21150936bbd8a9e25982d3a908cb
    Reviewed-on: https://gerrit.libreoffice.org/79305
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4c08d45be1ef..15f53a47b760 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1042,6 +1042,7 @@ public:
     virtual css::uno::Reference<css::awt::XWindow> CreateChildFrame() override
     {
         auto xPage = VclPtr<VclBin>::Create(m_xContainer.get());
+        xPage->set_expand(true);
         xPage->Show();
         return css::uno::Reference<css::awt::XWindow>(xPage->GetComponentInterface(), css::uno::UNO_QUERY);
     }
commit cf971dfcc94668f03ad0cf83b98d62ae1227ddba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 20 15:35:16 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 20 21:22:34 2019 +0200

    get the toplevel GtkWindow widget
    
    Change-Id: Ibcc20027062568b239d893bcf51887749abe4646
    Reviewed-on: https://gerrit.libreoffice.org/79304
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 4df3120e12d9..49e856a9c111 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11420,7 +11420,7 @@ weld::Window* GtkInstance::GetFrameWeld(const css::uno::Reference<css::awt::XWin
 weld::Window* GtkSalFrame::GetFrameWeld() const
 {
     if (!m_xFrameWeld)
-        m_xFrameWeld.reset(new GtkInstanceWindow(GTK_WINDOW(getWindow()), nullptr, false));
+        m_xFrameWeld.reset(new GtkInstanceWindow(GTK_WINDOW(gtk_widget_get_toplevel(getWindow())), nullptr, false));
     return m_xFrameWeld.get();
 }
 
commit 6ba2c613be6d840bec6d7a145c12c6e4385103ee
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 20 15:31:54 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 20 21:22:12 2019 +0200

    ensure embedded widget is realized
    
    Change-Id: Id43ca34d31d8e45482786a0739d981d7c85de686
    Reviewed-on: https://gerrit.libreoffice.org/79303
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 034d2f29f1f4..4df3120e12d9 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2733,6 +2733,7 @@ public:
         gtk_container_child_set(m_pContainer, pWindow, "expand", true, "fill", true, nullptr);
         gtk_widget_set_hexpand(pWindow, true);
         gtk_widget_set_vexpand(pWindow, true);
+        gtk_widget_realize(pWindow);
         g_object_unref(pWindow);
 
         xEmbedWindow->Show();