Merge pull request #11 from irwir/updates

Minor changes related to code style
ppescher · Jan 9, 2019 · ad4b6ab · ad4b6ab
2 parents c0f2ae8 + 7fca8c3
commit ad4b6ab
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 48 deletions.
diff --git a/ResizableLib/ResizableGrip.cpp b/ResizableLib/ResizableGrip.cpp
@@ -235,10 +235,8 @@ LRESULT CResizableGrip::CSizeGrip::WindowProc(UINT message,
 				BeginPaint(&ps) : CDC::FromHandle((HDC)wParam);
 
 			// select bitmaps
-			CBitmap *pOldGrip, *pOldMask;
-
-			pOldGrip = m_dcGrip.SelectObject(&m_bmGrip);
-			pOldMask = m_dcMask.SelectObject(&m_bmMask);
+			CBitmap *pOldGrip = m_dcGrip.SelectObject(&m_bmGrip);
+			CBitmap *pOldMask = m_dcMask.SelectObject(&m_bmMask);
 
 			// obtain original grip bitmap, make the mask and prepare masked bitmap
 			CScrollBar::WindowProc(message, (WPARAM)m_dcGrip.GetSafeHdc(), lParam);

diff --git a/ResizableLib/ResizableLayout.cpp b/ResizableLib/ResizableLayout.cpp
@@ -75,18 +75,13 @@ void CResizableLayout::AddAnchor(HWND hWnd, ANCHOR anchorTopLeft, ANCHOR anchorB
 	// adjust position, if client area has been scrolled
 	rectChild.OffsetRect(-rectParent.TopLeft());
 
-	// go calculate margins
-	CSize marginTopLeft, marginBottomRight;
-
 	// calculate margin for the top-left corner
-
-	marginTopLeft.cx = rectChild.left - rectParent.Width() * anchorTopLeft.cx / 100;
-	marginTopLeft.cy = rectChild.top - rectParent.Height() * anchorTopLeft.cy / 100;
+	CSize marginTopLeft(rectChild.left - rectParent.Width() * anchorTopLeft.cx / 100,
+				rectChild.top - rectParent.Height() * anchorTopLeft.cy / 100);
 
 	// calculate margin for the bottom-right corner
-
-	marginBottomRight.cx = rectChild.right - rectParent.Width() * anchorBottomRight.cx / 100;
-	marginBottomRight.cy = rectChild.bottom - rectParent.Height() * anchorBottomRight.cy / 100;
+	CSize marginBottomRight(rectChild.right - rectParent.Width() * anchorBottomRight.cx / 100,
+				rectChild.bottom - rectParent.Height() * anchorBottomRight.cy / 100);
 
 	// prepare the structure
 	LAYOUTINFO layout(hWnd, anchorTopLeft, marginTopLeft,
@@ -214,14 +209,12 @@ BOOL CResizableLayout::ArrangeLayoutCallback(LAYOUTINFO& layout) const
  */
 void CResizableLayout::ArrangeLayout() const
 {
-	// common vars
-	UINT uFlags;
-	CRect rectParent, rectChild;
 	const INT_PTR count = m_listLayout.GetCount() + m_listLayoutCB.GetCount();
-
 	if (count <= 0)
 		return;
 
+	CRect rectParent, rectChild;
+
 	// get parent window's rect
 	GetTotalClientRect(&rectParent);
 
@@ -233,6 +226,7 @@ void CResizableLayout::ArrangeLayout() const
 		// get layout info
 		const LAYOUTINFO layout = m_listLayout.GetNext(pos);
 
+		UINT uFlags;
 		// calculate new child's position, size and flags for SetWindowPos
 		CalcNewChildPosition(layout, rectParent, rectChild, &uFlags);
 
@@ -255,6 +249,7 @@ void CResizableLayout::ArrangeLayout() const
 		if (!ArrangeLayoutCallback(layout))
 			continue;
 
+		UINT uFlags;
 		// calculate new child's position, size and flags for SetWindowPos
 		CalcNewChildPosition(layout, rectParent, rectChild, &uFlags);
 

diff --git a/ResizableLib/ResizableSheet.cpp b/ResizableLib/ResizableSheet.cpp
@@ -399,24 +399,24 @@ int CResizableSheet::GetMinWidth()
 
 	int max = 0, min = rectSheet.Width();
 	// search for leftmost and rightmost button margins
-	for (int i = 0; i < 7; i++)
+	for (int i = 0; i < 7; ++i)
 	{
 		const CWnd* pWnd = GetDlgItem(_propButtons[i]);
 		// exclude not present or hidden buttons
-		if (pWnd == NULL || !(pWnd->GetStyle() & WS_VISIBLE))
-			continue;
-
-		// left position is relative to the right border
-		// of the parent window (negative value)
-		pWnd->GetWindowRect(&rectWnd);
-		::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&rectWnd, 2);
-		const int left = rectSheet.right - rectWnd.left;
-		const int right = rectSheet.right - rectWnd.right;
-
-		if (left > max)
-			max = left;
-		if (right < min)
-			min = right;
+		if (pWnd != NULL && (pWnd->GetStyle() & WS_VISIBLE))
+		{
+			// left position is relative to the right border
+			// of the parent window (negative value)
+			pWnd->GetWindowRect(&rectWnd);
+			::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&rectWnd, 2);
+			const int left = rectSheet.right - rectWnd.left;
+			const int right = rectSheet.right - rectWnd.right;
+
+			if (left > max)
+				max = left;
+			if (right < min)
+				min = right;
+		}
 	}
 
 	// sizing border width

diff --git a/ResizableLib/ResizableSheet.h b/ResizableLib/ResizableSheet.h
@@ -70,7 +70,6 @@ class CResizableSheet : public CPropertySheet, public CResizableLayout,
 	protected:
 	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 	//}}AFX_VIRTUAL
-	protected:
 
 // Implementation
 public:

diff --git a/ResizableLib/ResizableSheetEx.cpp b/ResizableLib/ResizableSheetEx.cpp
@@ -579,24 +579,24 @@ int CResizableSheetEx::GetMinWidth()
 
 	int max = 0, min = rectSheet.Width();
 	// search for leftmost and rightmost button margins
-	for (int i = 0; i < 7; i++)
+	for (int i = 0; i < 7; ++i)
 	{
 		const CWnd* pWnd = GetDlgItem(_propButtons[i]);
 		// exclude not present or hidden buttons
-		if (pWnd == NULL || !(pWnd->GetStyle() & WS_VISIBLE))
-			continue;
-
-		// left position is relative to the right border
-		// of the parent window (negative value)
-		pWnd->GetWindowRect(&rectWnd);
-		::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&rectWnd, 2);
-		const int left = rectSheet.right - rectWnd.left;
-		const int right = rectSheet.right - rectWnd.right;
-
-		if (left > max)
-			max = left;
-		if (right < min)
-			min = right;
+		if (pWnd != NULL && (pWnd->GetStyle() & WS_VISIBLE))
+		{
+			// left position is relative to the right border
+			// of the parent window (negative value)
+			pWnd->GetWindowRect(&rectWnd);
+			::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&rectWnd, 2);
+			const int left = rectSheet.right - rectWnd.left;
+			const int right = rectSheet.right - rectWnd.right;
+			
+			if (left > max)
+				max = left;
+			if (right < min)
+				min = right;
+		}
 	}
 
 	// sizing border width