strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: tdf#141258 turn scrollbars on/off once per layout loop

Browse source 
in this scenario the vertical scrollbar is turned off, then turned on
back to its original state but the off/on triggers another layout
loop later which does the same thing. Turn on/off just once per loop
so only one state change can occur so new layout is only triggered
if the state really changes.

Change-Id: I5736264a74723a15034e5fb467262dca6c0f283c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113447
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-04-01 10:31:27 +01:00
parent a2b1ee5b12
commit e8d93ae128
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
vcl/source/window/layout.cxx
View file

@ -1905,31 +1905,36 @@ void VclScrolledWindow::doSetAllocation(const Size &rAllocation, bool bRetryOnFa
tools::Long nAvailHeight = rAllocation.Height() - 2 * m_nBorderWidth;
tools::Long nAvailWidth = rAllocation.Width() - 2 * m_nBorderWidth;
// vert. ScrollBar
if (GetStyle() & WB_AUTOVSCROLL)
{
m_pVScroll->Show(nAvailHeight < aChildReq.Height());
}
else if (m_pVScroll->IsVisible() != bool(GetStyle() & WB_VSCROLL))
m_pVScroll->Show((GetStyle() & WB_VSCROLL) != 0);
if (m_pVScroll->IsVisible())
// vert. ScrollBar
bool bShowVScroll;
if (GetStyle() & WB_AUTOVSCROLL)
bShowVScroll = nAvailHeight < aChildReq.Height();
else
bShowVScroll = (GetStyle() & WB_VSCROLL) != 0;
if (bShowVScroll)
nAvailWidth -= getLayoutRequisition(*m_pVScroll).Width();
// horz. ScrollBar
bool bShowHScroll;
if (GetStyle() & WB_AUTOHSCROLL)
{
bool bShowHScroll = nAvailWidth < aChildReq.Width();
m_pHScroll->Show(bShowHScroll);
bShowHScroll = nAvailWidth < aChildReq.Width();
if (bShowHScroll)
nAvailHeight -= getLayoutRequisition(*m_pHScroll).Height();
if (GetStyle() & WB_AUTOVSCROLL)
m_pVScroll->Show(nAvailHeight < aChildReq.Height());
bShowVScroll = nAvailHeight < aChildReq.Height();
}
else if (m_pHScroll->IsVisible() != bool(GetStyle() & WB_HSCROLL))
m_pHScroll->Show((GetStyle() & WB_HSCROLL) != 0);
else
bShowHScroll = (GetStyle() & WB_HSCROLL) != 0;
if (m_pHScroll->IsVisible() != bShowHScroll)
m_pHScroll->Show(bShowHScroll);
if (m_pVScroll->IsVisible() != bShowVScroll)
m_pVScroll->Show(bShowVScroll);
Size aInnerSize(rAllocation);
aInnerSize.AdjustWidth(-2 * m_nBorderWidth);