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

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Sat Feb 22 08:02:09 UTC 2020


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

New commits:
commit 4fe30879af391c32074a003a7a6ddd45431d212a
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Fri Feb 21 00:37:04 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Feb 22 09:01:33 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>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 4a6075999096..2f6738485fb0 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1143,6 +1143,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;


More information about the Libreoffice-commits mailing list