修复水平和垂直布局在某些情况下布局不正确的bug

GXKe · May 20, 2016 · f69dc9f · f69dc9f
1 parent 770ef15
commit f69dc9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/DuiLib/Layout/UIHorizontalLayout.cpp b/DuiLib/Layout/UIHorizontalLayout.cpp
@@ -130,7 +130,8 @@ namespace DuiLib
 			if (iControlMaxHeight <= 0) iControlMaxHeight = pControl->GetMaxHeight();
 			if (szControlAvailable.cx > iControlMaxWidth) szControlAvailable.cx = iControlMaxWidth;
 			if (szControlAvailable.cy > iControlMaxHeight) szControlAvailable.cy = iControlMaxHeight;
-			if (iEstimate > 1) cxFixedRemaining = cxFixedRemaining - (rcPadding.left + rcPadding.right) - m_iChildPadding;
+      cxFixedRemaining = cxFixedRemaining - (rcPadding.left + rcPadding.right);
+			if (iEstimate > 1) cxFixedRemaining = cxFixedRemaining - m_iChildPadding;
 			SIZE sz = pControl->EstimateSize(szControlAvailable);
 			if (pControl->GetFixedWidth() == 0 || sz.cx == 0) {
 				iAdjustable++;

diff --git a/DuiLib/Layout/UIVerticalLayout.cpp b/DuiLib/Layout/UIVerticalLayout.cpp
@@ -123,7 +123,8 @@ namespace DuiLib
 			if (iControlMaxHeight <= 0) iControlMaxHeight = pControl->GetMaxHeight();
 			if (szControlAvailable.cx > iControlMaxWidth) szControlAvailable.cx = iControlMaxWidth;
 			if (szControlAvailable.cy > iControlMaxHeight) szControlAvailable.cy = iControlMaxHeight;
-			if (iEstimate > 1) cyFixedRemaining = cyFixedRemaining - (rcPadding.top + rcPadding.bottom) - m_iChildPadding;
+      cyFixedRemaining = cyFixedRemaining - (rcPadding.top + rcPadding.bottom);
+			if (iEstimate > 1) cyFixedRemaining = cyFixedRemaining - m_iChildPadding;
 			SIZE sz = pControl->EstimateSize(szControlAvailable);
 			if( sz.cy == 0 ) {
 				iAdjustable++;