Kaydet (Commit) 383db30b authored tarafından Caolán McNamara's avatar Caolán McNamara

aChildAllocation variable only set

Change-Id: I4a5c4e2b9c82dcaf8a48d411539a17dc0f1cfa15
üst 98c2a323
...@@ -1909,7 +1909,6 @@ void VclScrolledWindow::InitScrollBars(const Size &rRequest) ...@@ -1909,7 +1909,6 @@ void VclScrolledWindow::InitScrollBars(const Size &rRequest)
void VclScrolledWindow::setAllocation(const Size &rAllocation) void VclScrolledWindow::setAllocation(const Size &rAllocation)
{ {
Size aChildAllocation(rAllocation);
Size aChildReq; Size aChildReq;
vcl::Window *pChild = get_child(); vcl::Window *pChild = get_child();
...@@ -1940,7 +1939,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation) ...@@ -1940,7 +1939,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
m_pVScroll->Show(nAvailHeight < aChildReq.Height()); m_pVScroll->Show(nAvailHeight < aChildReq.Height());
} }
Size aInnerSize(aChildAllocation); Size aInnerSize(rAllocation);
long nScrollBarWidth = 0, nScrollBarHeight = 0; long nScrollBarWidth = 0, nScrollBarHeight = 0;
if (m_pVScroll->IsVisible()) if (m_pVScroll->IsVisible())
...@@ -1949,9 +1948,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation) ...@@ -1949,9 +1948,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
Point aScrollPos(rAllocation.Width() - nScrollBarWidth, 0); Point aScrollPos(rAllocation.Width() - nScrollBarWidth, 0);
Size aScrollSize(nScrollBarWidth, rAllocation.Height()); Size aScrollSize(nScrollBarWidth, rAllocation.Height());
setLayoutAllocation(*m_pVScroll, aScrollPos, aScrollSize); setLayoutAllocation(*m_pVScroll, aScrollPos, aScrollSize);
aChildAllocation.AdjustWidth( -nScrollBarWidth );
aInnerSize.AdjustWidth( -nScrollBarWidth ); aInnerSize.AdjustWidth( -nScrollBarWidth );
aChildAllocation.setHeight( aChildReq.Height() );
} }
if (m_pHScroll->IsVisible()) if (m_pHScroll->IsVisible())
...@@ -1960,9 +1957,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation) ...@@ -1960,9 +1957,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
Point aScrollPos(0, rAllocation.Height() - nScrollBarHeight); Point aScrollPos(0, rAllocation.Height() - nScrollBarHeight);
Size aScrollSize(rAllocation.Width(), nScrollBarHeight); Size aScrollSize(rAllocation.Width(), nScrollBarHeight);
setLayoutAllocation(*m_pHScroll, aScrollPos, aScrollSize); setLayoutAllocation(*m_pHScroll, aScrollPos, aScrollSize);
aChildAllocation.AdjustHeight( -nScrollBarHeight );
aInnerSize.AdjustHeight( -nScrollBarHeight ); aInnerSize.AdjustHeight( -nScrollBarHeight );
aChildAllocation.setWidth( aChildReq.Width() );
} }
if (m_pVScroll->IsVisible() && m_pHScroll->IsVisible()) if (m_pVScroll->IsVisible() && m_pHScroll->IsVisible())
......
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