commit 8777fc78ce7913b774d1c6ef660c7668c6c7b526
author Aleksei Nikiforov <darktemplar@basealt.ru> Thu Feb 21 10:24:39 2019 +0300
committer Thorsten Behrens <Thorsten.Behrens@CIB.de> Fri Feb 22 18:09:08 2019 +0100
tree c1d18ff5bef05a597737224c7306c059a168d1f0
parent e79e8117dcc7475d8d90afeaaac9eb7050ff244e

tdf#122256 KDE5: Make menubar work for windows with parents

Change-Id: I325faec8594e1c5b8b2c34a135f1604244e4826c
Reviewed-on: https://gerrit.libreoffice.org/68140
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

vcl/qt5/Qt5Frame.cxx

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 26db19e..615e275 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -111,9 +111,16 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
            aWinFlags |= Qt::Window;
    }

    if (!pParent && (aWinFlags == Qt::Window))
    if (aWinFlags == Qt::Window)
    {
        m_pTopLevel = new Qt5MainWindow(*this, nullptr, aWinFlags);
        QWidget* pParentWidget = nullptr;
        if (m_pParent)
        {
            pParentWidget
                = (m_pParent->m_pTopLevel) ? m_pParent->m_pTopLevel : m_pParent->m_pQWidget;
        }

        m_pTopLevel = new Qt5MainWindow(*this, pParentWidget, aWinFlags);
        m_pQWidget = new Qt5Widget(*this, aWinFlags);
        m_pTopLevel->setCentralWidget(m_pQWidget);
    }
@@ -127,8 +134,9 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
    if (pParent && !(pParent->m_nStyle & SalFrameStyleFlags::PLUG))
    {
        QWindow* pParentWindow = pParent->GetQWidget()->window()->windowHandle();
        QWindow* pChildWindow = m_pQWidget->window()->windowHandle();
        if (pParentWindow != pChildWindow)
        QWindow* pChildWindow = (m_pTopLevel ? m_pTopLevel->window()->windowHandle()
                                             : m_pQWidget->window()->windowHandle());
        if (pParentWindow && pChildWindow && (pParentWindow != pChildWindow))
            pChildWindow->setTransientParent(pParentWindow);
    }

@@ -377,8 +385,9 @@ void Qt5Frame::Center()
    if (m_pParent)
    {
        QWidget* pWindow = m_pParent->GetQWidget()->window();
        m_pQWidget->move(pWindow->frameGeometry().topLeft() + pWindow->rect().center()
                         - m_pQWidget->rect().center());
        QWidget* const pWidget = (m_pTopLevel) ? m_pTopLevel : m_pQWidget;
        pWidget->move(pWindow->frameGeometry().topLeft() + pWindow->rect().center()
                      - pWidget->rect().center());
    }
}