[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit 6f7893895794a4d92b1bd74803684c2ac01cd0fa
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 29 19:37:35 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Mar 3 15:25:16 2020 +0100

    tdf#131031 Gtk3 presume the resize did happen
    
    Regression from commit b26ca5b13733b46c2df0787502f885e15b390956
    ("tdf#130841 resize to client size after SetPosSize"). It just
    happens for me on gtk3, not gen and not win. But since gtk3 also
    sets the nX and nY value SetPosSize eventually before the fact,
    do the same for the nWidth and nHeight.
    
    Change-Id: I2898c403b73de790f3f988b8b8ec2067f4b0b43f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89760
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit a0e8a42a45abc7e626346bf01903ed81a026287d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89791
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 4c4005dc9a7c..111de9935891 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1479,6 +1479,9 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
     {
         m_bDefaultSize = false;
 
+        maGeometry.nWidth = nWidth;
+        maGeometry.nHeight = nHeight;
+
         if( isChild( false ) )
             widget_set_size_request(nWidth, nHeight);
         else if( ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) )