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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Frame.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8043727a5882d7cc7904a79ded6c989a18b8c67a
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Thu Oct 25 11:45:13 2018 +0200
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Thu Oct 25 15:57:05 2018 +0200

    Remembering window position regressed a little
    
    since commit 8d791a9d9657f6573ce27947c0289b36c6eba77c
    (Set Qt5Widget to be a central widget of QMainWindow)
    
    Change-Id: Ifd23043312a92b260871630862f1b949851a6d89
    Reviewed-on: https://gerrit.libreoffice.org/62348
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 45c4c3ee98fd..1901877c57ea 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -429,7 +429,10 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt1
         maGeometry.nY = nY;
 
         m_bDefaultPos = false;
-        m_pQWidget->move(nX, nY);
+        if (m_pTopLevel)
+            m_pTopLevel->move(nX, nY);
+        else
+            m_pQWidget->move(nX, nY);
     }
     else if (m_bDefaultPos)
         Center();
@@ -530,7 +533,7 @@ bool Qt5Frame::GetWindowState(SalFrameState* pState)
     pState->mnMask = WindowStateMask::State;
     if (isMinimized() /*|| !windowHandle()*/)
         pState->mnState |= WindowStateState::Minimized;
-    else if (m_pQWidget->isMaximized())
+    else if (isMaximized())
     {
         pState->mnState |= WindowStateState::Maximized;
     }