diff options
Diffstat (limited to 'vcl/qt5/Qt5Frame.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index 8e63a35cc5c8..270885249298 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -362,8 +362,6 @@ void Qt5Frame::DrawMenuBar() { /* not needed */} void Qt5Frame::SetExtendedFrameStyle(SalExtStyle /*nExtStyle*/) { /* not needed */} -void Qt5Frame::setVisible(bool bVisible) { asChild()->setVisible(bVisible); } - void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/) { assert(m_pQWidget); @@ -373,7 +371,7 @@ void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/) auto* pSalInst(static_cast<Qt5Instance*>(GetSalData()->m_pInstance)); assert(pSalInst); - pSalInst->RunInMainThread([this, bVisible]() { setVisible(bVisible); }); + pSalInst->RunInMainThread([this, bVisible]() { asChild()->setVisible(bVisible); }); } void Qt5Frame::SetMinClientSize(long nWidth, long nHeight) @@ -514,16 +512,7 @@ void Qt5Frame::SetModal(bool bModal) // modality change is only effective if the window is hidden if (bWasVisible) - { pChild->hide(); - if (QGuiApplication::platformName() == "xcb") - { - SAL_WARN("vcl.qt5", "SetModal called after Show - apply delay"); - // give QXcbConnection some time to recover from unmap - // ~/.xsession-errors => (BadWindow) (ChangeProperty) - QThread::msleep(250); - } - } pChild->setWindowModality(bModal ? Qt::WindowModal : Qt::NonModal); |