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

[Jan-Marek Glogowski (via logerrit)]

 vcl/source/window/window.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit b15f6e3388eb031f2c57d21f0ea109f90e4e3c61
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Thu Feb 20 16:42:09 2020 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Feb 22 10:02:28 2020 +0100

    tdf#130841 resize to client size after SetPosSize
    
    This fixes the hack of the native menu bar with a smaller client
    size in relation to the frame geometry.
    Eventually this should be replaced by proper mnTopBorder usage,
    but this currently isn't working.
    
    Change-Id: Ib5825d9c8f77e463fcb086e0373228fe91d8705a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89202
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit b26ca5b13733b46c2df0787502f885e15b390956)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89144
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 19e2e105a168..49551be5f901 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2789,6 +2789,10 @@ void Window::setPosSizePixel( long nX, long nY,
 
         pWindow->mpWindowImpl->mpFrame->SetPosSize( nX, nY, nWidth, nHeight, nSysFlags );
 
+        // Adjust resize with the hack of different client size and frame geometries to fix
+        // native menu bars. Eventually this should be replaced by proper mnTopBorder usage.
+        pWindow->mpWindowImpl->mpFrame->GetClientSize(nWidth, nHeight);
+
         // Resize should be called directly. If we haven't
         // set the correct size, we get a second resize from
         // the system with the correct size. This can be happened