diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-01 11:56:17 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-03-03 09:12:20 +0100 |
| commit | 411c870ed16c6a27bbd9c762e187783b3b39849e (patch) | |
| tree | 5a4815cda10c5039644fe10505a0f802cfc8a64b | |
| parent | a7e34eee41e40bc01cc68ea73d89bf730e5c2979 (diff) | |
tdf#140537 scroll-wheeling shouldn't affect disabled scrollbars
Change-Id: I5d8659c7d431d35d628b12cebfe6a4b4f9cab9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111703
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.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 9b562c340b6b..2cf77e81a688 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2059,7 +2059,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); } } } |