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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Widget.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8c4fac5bbd2c042c81ce9633637f60ba091f003e
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Jun 28 00:48:01 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun Jun 28 23:47:41 2020 +0200

    tdf#131991 Qt5 RTL mirror mouse wheel X position
    
    Just like all the other events, the mouse wheels X position must
    be mirrord in LO RTL mode.
    
    Change-Id: I28e8da0455d941f42f869b08edcdbe570de366c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97338
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit efc333b9bff560de0fd353da28296d8e08f55cee)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97306
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 1c7a130aabe4..0ef305f42949 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -192,7 +192,9 @@ void Qt5Widget::wheelEvent(QWheelEvent* pEvent)
     const Point aPos = toPoint(pEvent->pos() * m_rFrame.devicePixelRatioF());
 
     SalWheelMouseEvent aEvent;
-    aEvent.mnX = aPos.X();
+    aEvent.mnX = QGuiApplication::isLeftToRight()
+                     ? aPos.X()
+                     : round(width() * m_rFrame.devicePixelRatioF()) - aPos.X();
     aEvent.mnY = aPos.Y();
     aEvent.mnTime = pEvent->timestamp();
     aEvent.mnCode = GetKeyModCode(pEvent->modifiers()) | GetMouseModCode(pEvent->buttons());