VerticalLayout && VHorizontalLayout _contentRect calc

fxliang · Jan 13, 2024 · 163793c · 163793c
1 parent 65c12e7
commit 163793c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/WeaselUI/VHorizontalLayout.cpp b/WeaselUI/VHorizontalLayout.cpp
@@ -216,11 +216,7 @@ void VHorizontalLayout::DoLayout(CDCHandle dc, PDWR pDWR )
 	_PrepareRoundInfo(dc);
 
 	// truely draw content size calculation
-	int deflatex = offsetX - _style.border / 2;
-	int deflatey = offsetY - _style.border / 2;
-	_contentRect.DeflateRect(deflatex, deflatey);
-	// eliminate the 1 pixel gap when border width odd and padding equal to margin
-	if (_style.border % 2 == 0)	_contentRect.DeflateRect(1, 1);
+	_contentRect.DeflateRect(offsetX, offsetY);
 }
 
 void VHorizontalLayout::DoLayoutWithWrap(CDCHandle dc, PDWR pDWR)
@@ -538,10 +534,6 @@ void VHorizontalLayout::DoLayoutWithWrap(CDCHandle dc, PDWR pDWR)
 	}
 
 	// truely draw content size calculation
-	int deflatex = offsetX - _style.border / 2;
-	int deflatey = offsetY - _style.border / 2;
-	_contentRect.DeflateRect(deflatex, deflatey);
-	// eliminate the 1 pixel gap when border width odd and padding equal to margin
-	if (_style.border % 2 == 0)	_contentRect.DeflateRect(1, 1);
+	_contentRect.DeflateRect(offsetX, offsetY);
 }
 
diff --git a/WeaselUI/VerticalLayout.cpp b/WeaselUI/VerticalLayout.cpp
@@ -209,9 +209,5 @@ void weasel::VerticalLayout::DoLayout(CDCHandle dc, PDWR pDWR)
 	_PrepareRoundInfo(dc);
 
 	// truely draw content size calculation
-	int deflatex = offsetX - _style.border / 2;
-	int deflatey = offsetY - _style.border / 2;
-	_contentRect.DeflateRect(deflatex, deflatey);
-	// eliminate the 1 pixel gap when border width odd and padding equal to margin
-	if (_style.border % 2 == 0)	_contentRect.DeflateRect(1, 1);
+	_contentRect.DeflateRect(offsetX, offsetY);
 }