修正水平和垂直布局的最后一个子控件padding计算错误问题

tommy8421 · May 9, 2016 · 45096ae · 45096ae
1 parent 8259397
commit 45096ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/DuiLib/Layout/UIHorizontalLayout.cpp b/DuiLib/Layout/UIHorizontalLayout.cpp
@@ -124,6 +124,7 @@ namespace DuiLib
 			if( sz.cx == 0 ) {
 				iAdjustable++;
 				sz.cx = cxExpand;
+        cxFixedRemaining = cxFixedRemaining - (rcPadding.left + rcPadding.right);
 				// Distribute remaining to last element (usually round-off left-overs)
 				if( iAdjustable == nAdjustables ) {
 					sz.cx = MAX(0, szRemaining.cx - rcPadding.right - cxFixedRemaining);

diff --git a/DuiLib/Layout/UIVerticalLayout.cpp b/DuiLib/Layout/UIVerticalLayout.cpp
@@ -125,6 +125,7 @@ namespace DuiLib
 			if( sz.cy == 0 ) {
 				iAdjustable++;
 				sz.cy = cyExpand;
+        cyFixedRemaining = cyFixedRemaining - (rcPadding.top + rcPadding.bottom);
 				// Distribute remaining to last element (usually round-off left-overs)
 				if( iAdjustable == nAdjustables ) {
 					sz.cy = MAX(0, szRemaining.cy - rcPadding.bottom - cyFixedRemaining);