[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e08e75a7dac629c67c35945d23d5356d40e98c1f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 16 21:09:43 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sat Aug 22 04:22:20 2020 +0200

    tdf#135743 only overwrite our geometry with the valid entries
    
    Change-Id: I228ebfed17d922704d72529c714fde220b9d20cc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100794
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5b85c5a78f05..c5e475fb1555 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1526,13 +1526,15 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
             nY += m_pParent->maGeometry.nY;
         }
 
-        maGeometry.nX = nX;
-        maGeometry.nY = nY;
+        if (nFlags & SAL_FRAME_POSSIZE_X)
+            maGeometry.nX = nX;
+        if (nFlags & SAL_FRAME_POSSIZE_Y)
+            maGeometry.nY = nY;
         m_bGeometryIsProvisional = true;
 
         m_bDefaultPos = false;
 
-        moveWindow(nX, nY);
+        moveWindow(maGeometry.nX, maGeometry.nY);
 
         updateScreenNumber();
     }