diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-01 11:56:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-01 17:31:04 +0100 |
| commit | 86303d2372b30bf02e28ea2b223f0e0aa7a161a3 (patch) | |
| tree | fe5fc617ed723d5df06acc159a5b19766192d74d | |
| parent | e53e7609b4743a88b05e701c1a083c10f1d49022 (diff) | |
tdf#140537 scroll-wheeling shouldn't affect disabled scrollbars
Change-Id: I5d8659c7d431d35d628b12cebfe6a4b4f9cab9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111748
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/layout.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 1408a3dc6dd0..ccdcc923117f 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2051,7 +2051,10 @@ bool VclScrolledWindow::EventNotify(NotifyEvent& rNEvt) const CommandWheelData* pData = rCEvt.GetWheelData(); if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) ) { - bDone = HandleScrollCommand(rCEvt, m_pHScroll, m_pVScroll); + // tdf#140537 only handle scroll commands in the valid shown scrollbars + bDone = HandleScrollCommand(rCEvt, + m_pHScroll->IsVisible() ? m_pHScroll : nullptr, + m_pVScroll->IsVisible() ? m_pVScroll : nullptr); } } } |