[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/layout.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7e9671ab15bcf6173a7a26d951ff1a2793584b1b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 25 13:45:18 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 25 16:21:12 2019 +0200

    set second child to remaining size
    
    Change-Id: I2fad36cb4cb866418dcf4514e2f23b9658a957ed
    Reviewed-on: https://gerrit.libreoffice.org/81501
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 0f8ba88e61b7..ce0d15afddab 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2452,7 +2452,7 @@ void VclVPaned::setAllocation(const Size& rAllocation)
         nFirstHeight += nHeightDiff/2;
     else if (bFirstCanResize)
         nFirstHeight += nHeightDiff;
-    arrange(rAllocation, nFirstHeight, nSecondHeight);
+    arrange(rAllocation, nFirstHeight, rAllocation.Height() - nFirstHeight - aSplitterSize.Height());
 }
 
 Size VclVPaned::calculateRequisition() const
@@ -2473,7 +2473,7 @@ Size VclVPaned::calculateRequisition() const
 }
 
 VclHPaned::VclHPaned(vcl::Window *pParent)
-    : VclPaned(pParent, true)
+    : VclPaned(pParent, false)
 {
     m_pSplitter->SetSplitHdl(LINK(this, VclHPaned, SplitHdl));
 }
@@ -2559,7 +2559,7 @@ void VclHPaned::setAllocation(const Size& rAllocation)
         nFirstWidth += nWidthDiff/2;
     else if (bFirstCanResize)
         nFirstWidth += nWidthDiff;
-    arrange(rAllocation, nFirstWidth, nSecondWidth);
+    arrange(rAllocation, nFirstWidth, rAllocation.Width() - nFirstWidth - aSplitterSize.Width());
 }
 
 Size VclHPaned::calculateRequisition() const