mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop condition reversed, sigh

Browse Source 
Change-Id: If96d982bf4377eab29a2dfb94b0a453e12450786
This commit is contained in:
Caolán McNamara
2014-01-09 12:04:43 +00:00
parent d3aad81268
commit 03e0781145
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vcl/source/window/layout.cxx
View File

@@ -1124,12 +1124,12 @@ void VclGrid::setAllocation(const Size& rAllocation)
//We don't fit and there is no volunteer to be shrunk //We don't fit and there is no volunteer to be shrunk
if (!nExpandables && rAllocation.Width() < aRequisition.Width()) if (!nExpandables && rAllocation.Width() < aRequisition.Width())
{ {
//first reduce spacing, to a min of 3 //first reduce spacing
while (nColSpacing >= 6) while (nColSpacing)
{ {
nColSpacing /= 2; nColSpacing /= 2;
aRequisition = calculateRequisitionForSpacings(nRowSpacing, nColSpacing); aRequisition = calculateRequisitionForSpacings(nRowSpacing, nColSpacing);
if (aRequisition.Width() >= rAllocation.Width()) if (aRequisition.Width() <= rAllocation.Width())
break; break;
} }
@@ -1167,12 +1167,12 @@ void VclGrid::setAllocation(const Size& rAllocation)
//We don't fit and there is no volunteer to be shrunk //We don't fit and there is no volunteer to be shrunk
if (!nExpandables && rAllocation.Height() < aRequisition.Height()) if (!nExpandables && rAllocation.Height() < aRequisition.Height())
{ {
//first reduce spacing, to a min of 3 //first reduce spacing
while (nRowSpacing >= 6) while (nRowSpacing)
{ {
nRowSpacing /= 2; nRowSpacing /= 2;
aRequisition = calculateRequisitionForSpacings(nRowSpacing, nColSpacing); aRequisition = calculateRequisitionForSpacings(nRowSpacing, nColSpacing);
if (aRequisition.Height() >= rAllocation.Height()) if (aRequisition.Height() <= rAllocation.Height())
break; break;
} }