Kaydet (Commit) 749f7548 authored tarafından Caolán McNamara's avatar Caolán McNamara

only subtract height of hscroll if visible

otherwise infinite loop in extensions update check

Change-Id: I0dbf4f34208f1bf0854e365006a79470b26571f3
üst 788632dc
...@@ -1706,8 +1706,11 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation) ...@@ -1706,8 +1706,11 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
// horz. ScrollBar // horz. ScrollBar
if (GetStyle() & WB_AUTOHSCROLL) if (GetStyle() & WB_AUTOHSCROLL)
{ {
m_aHScroll.Show(nAvailWidth < aChildReq.Width()); bool bShowHScroll = nAvailWidth < aChildReq.Width();
nAvailHeight -= getLayoutRequisition(m_aHScroll).Height(); m_aHScroll.Show(bShowHScroll);
if (bShowHScroll)
nAvailHeight -= getLayoutRequisition(m_aHScroll).Height();
if (GetStyle() & WB_AUTOVSCROLL) if (GetStyle() & WB_AUTOVSCROLL)
m_aVScroll.Show(nAvailHeight < aChildReq.Height()); m_aVScroll.Show(nAvailHeight < aChildReq.Height());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment