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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55007b9d2cba31448b1785069b26dcf71c9c122c
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Fri Feb 21 00:37:04 2020 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Feb 22 11:06:34 2020 +0100

    tdf#130827 Qt5 report frame-relative cursor pos
    
    Qt5Frame::GetPointerState expects the cursor position relative to
    the frame position.
    
    Change-Id: Icaf7dcd8fc80d712f5138a9f9b843ccf345c5543
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89244
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 4fe30879af391c32074a003a7a6ddd45431d212a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89268
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 919336553d07..b38b92f143c9 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1133,6 +1133,7 @@ SalFrame::SalPointerState Qt5Frame::GetPointerState()
 {
     SalPointerState aState;
     aState.maPos = toPoint(QCursor::pos());
+    aState.maPos.Move(-maGeometry.nX, -maGeometry.nY);
     aState.mnState = GetMouseModCode(QGuiApplication::mouseButtons())
                      | GetKeyModCode(QGuiApplication::keyboardModifiers());
     return aState;