vcl/qt5/Qt5Frame.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit bb9ddf256452a3fe5aec2f638335453063449f5f Author: Aleksei Nikiforov <[email protected]> AuthorDate: Fri Nov 2 18:12:25 2018 +0300 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Thu Nov 8 15:56:43 2018 +0100 tdf#120777 KDE5: Prohibit resizing windows unless they're marked resizeable Change-Id: I412c3d263881d24dea1bb61520c2291d8f0b9b20 Reviewed-on: https://gerrit.libreoffice.org/63016 Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Samuel Mehrbrodt <[email protected]> diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index b5680b654771..70c3de1abcc9 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -400,10 +400,12 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt1 m_bDefaultSize = false; if (isChild(false) || !m_pQWidget->isMaximized()) { - if (m_pTopLevel) - m_pTopLevel->resize(nWidth, nHeight); + QWidget* const pWidget = (m_pTopLevel) ? m_pTopLevel : m_pQWidget; + + if (m_nStyle & SalFrameStyleFlags::SIZEABLE) + pWidget->resize(nWidth, nHeight); else - m_pQWidget->resize(nWidth, nHeight); + pWidget->setFixedSize(nWidth, nHeight); } } else if (m_bDefaultSize) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
