修复padding属性导致自动计算宽高度错误的bug

bing2514 · Jan 20, 2015 · 4f409c8 · 4f409c8
1 parent 8692be9
commit 4f409c8
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 4 deletions.
diff --git a/DuiLib/Layout/UIHorizontalLayout.cpp b/DuiLib/Layout/UIHorizontalLayout.cpp
@@ -105,9 +105,11 @@ namespace DuiLib
 				if( sz.cx < pControl->GetMinWidth() ) sz.cx = pControl->GetMinWidth();
 				if( sz.cx > pControl->GetMaxWidth() ) sz.cx = pControl->GetMaxWidth();
 
-				cxFixedRemaining -= (sz.cx + rcPadding.left + rcPadding.right + m_iChildPadding);
+				cxFixedRemaining -= sz.cx + rcPadding.left + rcPadding.right ;
 			}
 
+			cxFixedRemaining -= m_iChildPadding;
+
 			sz.cy = pControl->GetFixedHeight();
 			if( sz.cy == 0 ) sz.cy = rc.bottom - rc.top - rcPadding.top - rcPadding.bottom;
 			if( sz.cy < 0 ) sz.cy = 0;

diff --git a/DuiLib/Layout/UIVerticalLayout.cpp b/DuiLib/Layout/UIVerticalLayout.cpp
@@ -109,9 +109,11 @@ namespace DuiLib
 			else {
 				if( sz.cy < pControl->GetMinHeight() ) sz.cy = pControl->GetMinHeight();
 				if( sz.cy > pControl->GetMaxHeight() ) sz.cy = pControl->GetMaxHeight();
-				cyFixedRemaining -= (sz.cy + rcPadding.top + rcPadding.bottom + m_iChildPadding);
+				cyFixedRemaining -= sz.cy + rcPadding.top + rcPadding.bottom + m_iChildPadding;
 			}
 
+			cyFixedRemaining -= m_iChildPadding;
+
 			sz.cx = pControl->GetFixedWidth();
 			if( sz.cx == 0 ) sz.cx = szAvailable.cx - rcPadding.left - rcPadding.right;
 			if( sz.cx < 0 ) sz.cx = 0;

diff --git a/Lib2008/DuiLib_u.lib b/Lib2008/DuiLib_u.lib
diff --git a/Lib2008/DuiLib_ud.lib b/Lib2008/DuiLib_ud.lib
diff --git a/Lib2008/UiLib_u.lib b/Lib2008/UiLib_u.lib
diff --git a/Lib2008/UiLib_ud.lib b/Lib2008/UiLib_ud.lib
diff --git a/UiLib/Layout/UIHorizontalLayout.cpp b/UiLib/Layout/UIHorizontalLayout.cpp
@@ -106,9 +106,11 @@ namespace UiLib
 				if( sz.cx < pControl->GetMinWidth() ) sz.cx = pControl->GetMinWidth();
 				if( sz.cx > pControl->GetMaxWidth() ) sz.cx = pControl->GetMaxWidth();
 
-				cxFixedRemaining -= (sz.cx + rcPadding.left + rcPadding.right + m_iChildPadding);
+				cxFixedRemaining -= sz.cx + rcPadding.left + rcPadding.right ;
 			}
 
+			cxFixedRemaining -= m_iChildPadding;
+
 			sz.cy = pControl->GetFixedHeight();
 			if( sz.cy == 0 ) sz.cy = rc.bottom - rc.top - rcPadding.top - rcPadding.bottom;
 			if( sz.cy < 0 ) sz.cy = 0;

diff --git a/UiLib/Layout/UIVerticalLayout.cpp b/UiLib/Layout/UIVerticalLayout.cpp
@@ -110,9 +110,11 @@ namespace UiLib
 			else {
 				if( sz.cy < pControl->GetMinHeight() ) sz.cy = pControl->GetMinHeight();
 				if( sz.cy > pControl->GetMaxHeight() ) sz.cy = pControl->GetMaxHeight();
-				cyFixedRemaining -= (sz.cy + rcPadding.top + rcPadding.bottom + m_iChildPadding);
+				cyFixedRemaining -= sz.cy + rcPadding.top + rcPadding.bottom + m_iChildPadding;
 			}
 
+			cyFixedRemaining -= m_iChildPadding;
+
 			sz.cx = pControl->GetFixedWidth();
 			if( sz.cx == 0 ) sz.cx = szAvailable.cx - rcPadding.left - rcPadding.right;
 			if( sz.cx < 0 ) sz.cx = 0;

diff --git a/dll/DuiLib_u.dll b/dll/DuiLib_u.dll
diff --git a/dll/DuiLib_ud.dll b/dll/DuiLib_ud.dll
diff --git a/dll/UiLib_u.dll b/dll/UiLib_u.dll
diff --git a/dll/UiLib_ud.dll b/dll/UiLib_ud.dll
diff --git a/dll2008/DuiLib_u.dll b/dll2008/DuiLib_u.dll
diff --git a/dll2008/DuiLib_ud.dll b/dll2008/DuiLib_ud.dll
diff --git a/dll2008/UiLib_u.dll b/dll2008/UiLib_u.dll
diff --git a/dll2008/UiLib_ud.dll b/dll2008/UiLib_ud.dll
diff --git a/lib/DuiLib_u.lib b/lib/DuiLib_u.lib
diff --git a/lib/DuiLib_ud.lib b/lib/DuiLib_ud.lib
diff --git a/lib/Uilib_u.lib b/lib/Uilib_u.lib