only subtract height of hscroll if visible

otherwise infinite loop in extensions update check Change-Id: I0dbf4f34208f1bf0854e365006a79470b26571f3

only subtract height of hscroll if visible
otherwise infinite loop in extensions update check Change-Id: I0dbf4f34208f1bf0854e365006a79470b26571f3
749f7548 · Caolán McNamara · 788632dc · 749f7548
Kaydet (Commit) 749f7548 authored Agu 19, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

layout.cxx vcl/source/window/layout.cxx +5 -2

No files found.
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1706,8 +1706,11 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
    // horz. ScrollBar
    if (GetStyle() & WB_AUTOHSCROLL)
    {
-        m_aHScroll.Show(nAvailWidth < aChildReq.Width());
-        nAvailHeight -= getLayoutRequisition(m_aHScroll).Height();
+        bool bShowHScroll = nAvailWidth < aChildReq.Width();
+        m_aHScroll.Show(bShowHScroll);
+
+        if (bShowHScroll)
+            nAvailHeight -= getLayoutRequisition(m_aHScroll).Height();

        if (GetStyle() & WB_AUTOVSCROLL)
            m_aVScroll.Show(nAvailHeight < aChildReq.Height());