diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-08-13 11:34:40 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-08-13 17:51:09 +0200 |
| commit | a0a6a7e60ee499ffd82a57b899ca5f4981f0ab2f (patch) | |
| tree | 4903838a4aa18d9e6626d4afd1b9827552fd359e | |
| parent | 1352b1fcfa1668081c3197a12d5362286f8f9710 (diff) | |
tdf#126680 Revert "VCL make horizontal scrolling depend on RTL"
This reverts commit 845743131b733b52eb913048f55f5efdd013b24f.
And fixes the direction in Qt, which I intentionally broke. Didn't
find time yet to fix all the backends, so just stay with the
original code.
Change-Id: I9967a0d7e75dcb99f8465e9eecf81afe2d351064
Reviewed-on: https://gerrit.libreoffice.org/77390
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
| -rw-r--r-- | vcl/qt5/Qt5Widget.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx index 843ce798a989..f3dbfd516716 100644 --- a/vcl/qt5/Qt5Widget.cxx +++ b/vcl/qt5/Qt5Widget.cxx @@ -191,7 +191,7 @@ void Qt5Widget::wheelEvent(QWheelEvent* pEvent) aEvent.mbHorz = nDelta == 0; if (aEvent.mbHorz) { - nDelta = (QGuiApplication::isLeftToRight() ? -1 : 1) * pEvent->angleDelta().x(); + nDelta = (QGuiApplication::isLeftToRight() ? 1 : -1) * pEvent->angleDelta().x(); if (!nDelta) return; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 701a8730ed87..16f202ee09df 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -667,9 +667,10 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, nLines = pData->GetNotchDelta() * nScrollLines; if ( nLines ) { - ImplHandleScroll(nullptr, 0L, pData->IsHorz() ? pHScrl : pVScrl, - pData->IsHorz() && pHScrl && (AllSettings::GetLayoutRTL() == pHScrl->IsRTLEnabled()) - ? -nLines : nLines); + ImplHandleScroll( nullptr, + 0L, + pData->IsHorz() ? pHScrl : pVScrl, + nLines ); bRet = true; } } |