Обновлен ResizableLib v1.5.3-8-g25a89da.

docs/Changelog.Rus.txt

@@ -20,6 +20,7 @@ MPCVideoDec
 
 Обновлены библиотеки:
 	ffmpeg n7.1-dev-1688-ge0eff64ed1;
+	ResizableLib v1.5.3-8-g25a89da;
 	vvdec v2.3.0-24-gad8f4bb.
 
 

docs/Changelog.txt

@@ -20,6 +20,7 @@ Updated Japanese translation (by tsubasanouta).
 
 Updated libraries:
 	ffmpeg n7.1-dev-1688-ge0eff64ed1;
+	ResizableLib v1.5.3-8-g25a89da;
 	vvdec v2.3.0-24-gad8f4bb.
 
 

src/ExtLib/ui/ResizableLib/ResizableDialog.cpp

@@ -5,7 +5,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0
@@ -82,18 +82,19 @@ BOOL CResizableDialog::OnNcCreate(LPCREATESTRUCT lpCreateStruct)
 	if (!CreateSizeGrip(!bChild))
 		return FALSE;
 
+	// Moved from behind if (!bChild) because user could resize the dialog smaller as in resource defined and that causes some static text to be clipped or disappear.
+	MakeResizable(lpCreateStruct);
+
 	if (!bChild)
 	{
 		// set the initial size as the min track size
 		SetMinTrackSize(CSize(lpCreateStruct->cx, lpCreateStruct->cy));
 	}
-
-	MakeResizable(lpCreateStruct);
 
 	return TRUE;
 }
 
-void CResizableDialog::OnDestroy() 
+void CResizableDialog::OnDestroy()
 {
 	if (m_bEnableSaveRestore)
 		SaveWindowRect(m_sSection, m_bRectOnly);
@@ -106,10 +107,10 @@ void CResizableDialog::OnDestroy()
 	__super::OnDestroy();
 }
 
-void CResizableDialog::OnSize(UINT nType, int cx, int cy) 
+void CResizableDialog::OnSize(UINT nType, int cx, int cy)
 {
 	__super::OnSize(nType, cx, cy);
-	
+
 	if (nType == SIZE_MAXHIDE || nType == SIZE_MAXSHOW)
 		return;		// arrangement not needed
 
@@ -123,7 +124,7 @@ void CResizableDialog::OnSize(UINT nType, int cx, int cy)
 	ArrangeLayout();
 }
 
-void CResizableDialog::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) 
+void CResizableDialog::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
 {
 	MinMaxInfo(lpMMI);
 }
@@ -141,7 +142,7 @@ void CResizableDialog::EnableSaveRestore(LPCTSTR pszSection, BOOL bRectOnly)
 	LoadWindowRect(pszSection, bRectOnly);
 }
 
-BOOL CResizableDialog::OnEraseBkgnd(CDC* pDC) 
+BOOL CResizableDialog::OnEraseBkgnd(CDC* pDC)
 {
 	ClipChildren(pDC, FALSE);
 
@@ -152,7 +153,7 @@ BOOL CResizableDialog::OnEraseBkgnd(CDC* pDC)
 	return bRet;
 }
 
-LRESULT CResizableDialog::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) 
+LRESULT CResizableDialog::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
 	if (message != WM_NCCALCSIZE || wParam == 0)
 		return __super::WindowProc(message, wParam, lParam);

src/ExtLib/ui/ResizableLib/ResizableDialog.h

@@ -12,7 +12,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0

src/ExtLib/ui/ResizableLib/ResizableGrip.cpp

@@ -3,7 +3,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0
@@ -61,7 +61,7 @@ void CResizableGrip::UpdateSizeGrip()
 		| (IsSizeGripVisible() ? SWP_SHOWWINDOW : SWP_HIDEWINDOW));
 }
 
-// pbStatus points to a variable, maintained by the caller, that
+// pStatus points to a variable, maintained by the caller, that
 // holds its visibility status. Initialize the variable with 1
 // to allow to temporarily hide the grip, 0 to allow to
 // temporarily show the grip (with respect to the dwMask bit).
@@ -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);

src/ExtLib/ui/ResizableLib/ResizableGrip.h

@@ -3,7 +3,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0

src/ExtLib/ui/ResizableLib/ResizableLayout.cpp

@@ -3,7 +3,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0
@@ -28,6 +28,19 @@ static char THIS_FILE[]=__FILE__;
 #define new DEBUG_NEW
 #endif
 
+/*!
+ *  Definition of the standard anchors
+ */
+const ANCHOR TOP_LEFT(0, 0);
+const ANCHOR TOP_CENTER(50, 0);
+const ANCHOR TOP_RIGHT(100, 0);
+const ANCHOR MIDDLE_LEFT(0, 50);
+const ANCHOR MIDDLE_CENTER(50, 50);
+const ANCHOR MIDDLE_RIGHT(100, 50);
+const ANCHOR BOTTOM_LEFT(0, 100);
+const ANCHOR BOTTOM_CENTER(50, 100);
+const ANCHOR BOTTOM_RIGHT(100, 100);
+
 /*!
  *  @internal Constant used to detect clipping and refresh properties
  *
@@ -75,18 +88,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,
@@ -128,19 +136,29 @@ void CResizableLayout::AddAllOtherAnchors(ANCHOR anchorTopLeft, ANCHOR anchorBot
 	ASSERT(::IsWindow(hParent));
 
 	HWND hWnd = ::GetWindow(hParent, GW_CHILD);
-	while (hWnd != NULL)
+	for (; hWnd != NULL; hWnd = ::GetNextWindow(hWnd, GW_HWNDNEXT))
 	{
+		TCHAR szClassName[32];
+		if (::GetClassName(hWnd, szClassName, _countof(szClassName)))
+		{
+			if (lstrcmp(szClassName, WC_SCROLLBAR) == 0)
+			{
+				// skip size grip (which is handled on its own)
+				DWORD dwStyle = ::GetWindowLong(hWnd, GWL_STYLE);
+				if ((dwStyle & (WS_CHILD | WS_CLIPSIBLINGS | SBS_SIZEGRIP)) == (WS_CHILD | WS_CLIPSIBLINGS | SBS_SIZEGRIP))
+					continue;
+			}
+		}
+
 		POSITION pos;
 		if (!m_mapLayout.Lookup(hWnd, pos))
 			AddAnchor(hWnd, anchorTopLeft, anchorBottomRight);
-
-		hWnd = ::GetNextWindow(hWnd, GW_HWNDNEXT);
 	}
 }
 
 /*!
  *  This function adds a placeholder to the layout manager, that will be
- *  dinamically set by a callback function whenever required.
+ *  dynamically set by a callback function whenever required.
  *
  *  @return The return value is an integer used to distinguish between
  *          different placeholders in the callback implementation.
@@ -196,22 +214,20 @@ BOOL CResizableLayout::ArrangeLayoutCallback(LAYOUTINFO& layout) const
  *  controls layout should be updated, usually after a resize operation.
  *
  *  @remarks All the controls added to the layout are moved and resized at
- *           once for performace reasons, so all the controls are in their
+ *           once for performance reasons, so all the controls are in their
  *           old position when AddAnchorCallback is called.
  *           To know where a control will be placed use GetAnchorPosition.
  *
  *  @sa AddAnchor AddAnchorCallback ArrangeLayoutCallback GetAnchorPosition
  */
 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);
 
@@ -223,6 +239,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);
 
@@ -245,6 +262,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);
 
@@ -345,7 +363,7 @@ void CResizableLayout::GetClippingRegion(CRgn* pRegion) const
 		if (::IsWindowVisible(layout.hWnd))
 			ClipChildWindow(layout, pRegion);
 	}
-	
+
 	for (POSITION pos = m_listLayoutCB.GetHeadPosition(); pos != NULL;)
 	{
 		// get layout info
@@ -379,7 +397,7 @@ inline CWnd* GetRootParentWnd(CWnd* pWnd)
  *  area to avoid flickering.
  *
  *  @param pDC Pointer to the target device context
- *  @param bUndo Flag that specifies wether to restore the clipping region
+ *  @param bUndo Flag that specifies whether to restore the clipping region
  *
  *  @return The return value is @c TRUE if the clipping region has been
  *          modified, @c FALSE otherwise
@@ -594,7 +612,7 @@ BOOL CResizableLayout::LikesClipping(const LAYOUTINFO& layout) const
 			return clipping.bLikesClipping;
 	}
 
-	LONG_PTR style = ::GetWindowLongPtr(layout.hWnd, GWL_STYLE);
+	const LONG_PTR style = ::GetWindowLongPtr(layout.hWnd, GWL_STYLE);
 
 	// skip windows that wants background repainted
 	if (0 == lstrcmp(layout.sWndClass, WC_BUTTON))
@@ -684,7 +702,8 @@ void CResizableLayout::CalcNewChildPosition(const LAYOUTINFO& layout,
 		NeedsRefresh(layout, rectChild, rectNew) : layout.properties.bCachedNeedsRefresh;
 
 	// set flags
-	if (lpFlags) {
+	if (lpFlags)
+	{
 		*lpFlags = SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION;
 		if (bRefresh)
 			*lpFlags |= SWP_NOCOPYBITS;
@@ -721,10 +740,10 @@ BOOL CResizableLayout::GetAnchorMargins(HWND hWnd, const CSize &sizeChild, CRect
 	const LAYOUTINFO& layout = m_listLayout.GetAt(pos);
 
 	// augmented size, relative to anchor points
-	CSize size = sizeChild + layout.marginTopLeft - layout.marginBottomRight;
+	const CSize size = sizeChild + layout.marginTopLeft - layout.marginBottomRight;
 
 	// percent of parent size occupied by this control
-	CSize percent(layout.anchorBottomRight.cx - layout.anchorTopLeft.cx,
+	const CSize percent(layout.anchorBottomRight.cx - layout.anchorTopLeft.cx,
 		layout.anchorBottomRight.cy - layout.anchorTopLeft.cy);
 
 	// calculate total margins
@@ -755,10 +774,10 @@ BOOL CResizableLayout::GetAnchorMargins(HWND hWnd, const CSize &sizeChild, CRect
  *           @c LikesClipping only once, and the @a refresh property as
  *           dynamic, causing @c NeedsRefresh to be called every time.
  *        @n This should be right for most situations, as the need for
- *           @a refresh usually depends on the size fo a control, while the
+ *           @a refresh usually depends on the size of the control, while the
  *           support for @a clipping is usually linked to the specific type
  *           of control, which is unlikely to change at run-time, but you can
- *           still override this function if a different beahvior is needed.
+ *           still override this function if a different behaviour is needed.
  *
  *  @sa LikesClipping NeedsRefresh LAYOUTINFO RESIZEPROPERTIES
  */
@@ -827,7 +846,7 @@ void CResizableLayout::MakeResizable(LPCREATESTRUCT lpCreateStruct) const
  *  This function should be called inside the parent window @c WM_NCCALCSIZE
  *  message handler to help eliminate flickering.
  *
- *  @param bAfterDefault Flag that specifies wether the call is made before
+ *  @param bAfterDefault Flag that specifies whether the call is made before
  *         or after the default handler
  *  @param lpncsp Pointer to the @c NCCALCSIZE_PARAMS structure that is
  *         passed to the message handler

src/ExtLib/ui/ResizableLib/ResizableLayout.h

@@ -3,7 +3,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0
@@ -54,27 +54,27 @@ typedef struct tagANCHOR
 } ANCHOR, *PANCHOR, *LPANCHOR;
 
 /*! @defgroup ConstAnchors Alignment Constants
- *  Define common layout alignment constants for anchor points.
+ *  Declare common layout alignment constants for anchor points.
  *  @{
  */
 	//! Anchor to the top-left corner
-	inline const ANCHOR TOP_LEFT(0, 0);
+	extern const ANCHOR TOP_LEFT;
 	//! Anchor to the top edge and center horizontally
-	inline const ANCHOR TOP_CENTER(50, 0);
+	extern const ANCHOR TOP_CENTER;
 	//! Anchor to the top-right corner
-	inline const ANCHOR TOP_RIGHT(100, 0);
+	extern const ANCHOR TOP_RIGHT;
 	//! Anchor to the left edge and center vertically
-	inline const ANCHOR MIDDLE_LEFT(0, 50);
+	extern const ANCHOR MIDDLE_LEFT;
 	//! Anchor to the center
-	inline const ANCHOR MIDDLE_CENTER(50, 50);
+	extern const ANCHOR MIDDLE_CENTER;
 	//! Anchor to the right edge and center vertically
-	inline const ANCHOR MIDDLE_RIGHT(100, 50);
+	extern const ANCHOR MIDDLE_RIGHT;
 	//! Anchor to the bottom-left corner
-	inline const ANCHOR BOTTOM_LEFT(0, 100);
+	extern const ANCHOR BOTTOM_LEFT;
 	//! Anchor to the bottom edge and center horizontally
-	inline const ANCHOR BOTTOM_CENTER(50, 100);
+	extern const ANCHOR BOTTOM_CENTER;
 	//! Anchor to the bottom-right corner
-	inline const ANCHOR BOTTOM_RIGHT(100, 100);
+	extern const ANCHOR BOTTOM_RIGHT;
 // @}
 
 //! @brief Holds a control layout settings

src/ExtLib/ui/ResizableLib/ResizableMinMax.cpp

@@ -3,7 +3,7 @@
 // This file is part of ResizableLib
 // https://github.com/ppescher/resizablelib
 //
-// Copyright (C) 2000-2015 by Paolo Messina
+// Copyright (C) 2000-2024 by Paolo Messina
 // mailto:[email protected]
 //
 // The contents of this file are subject to the Artistic License 2.0