commit 411c870ed16c6a27bbd9c762e187783b3b39849e
author Caolán McNamara <caolanm@redhat.com> Mon Mar 01 11:56:17 2021 +0000
committer Adolfo Jayme Barrientos <fitojb@ubuntu.com> Wed Mar 03 09:12:20 2021 +0100
tree 5a4815cda10c5039644fe10505a0f802cfc8a64b
parent a7e34eee41e40bc01cc68ea73d89bf730e5c2979

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>

vcl/source/window/layout.cxx

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9b562c3..2cf77e8 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);
            }
        }
    }