支持Win11的SnapLayout贴边布局特性

qdtroy · asfdghf · commit 8b901bdec08b · 2023-04-15T13:21:35.000+08:00
diff --git a/DuiLib/Core/UIManager.cpp b/DuiLib/Core/UIManager.cpp
@@ -1966,6 +1966,11 @@ namespace DuiLib {
 		::InvalidateRect(m_hWndPaint, &rcItem, FALSE);
 	}
 
+	bool CPaintManagerUI::IsValid()
+	{
+		return m_hWndPaint != NULL && m_pRoot != NULL;
+	}
+
 	bool CPaintManagerUI::AttachDialog(CControlUI* pControl)
 	{
 		ASSERT(::IsWindow(m_hWndPaint));
diff --git a/DuiLib/Core/UIManager.h b/DuiLib/Core/UIManager.h
@@ -373,6 +373,7 @@ namespace DuiLib {
 		void SetDragDrop(IDragDropUI* pDragDrop);
 		virtual bool OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium,DWORD *pdwEffect);
 
+		bool IsValid();
 		bool AttachDialog(CControlUI* pControl);
 		bool InitControls(CControlUI* pControl, CControlUI* pParent = NULL);
 		void ReapObjects(CControlUI* pControl);
diff --git a/DuiLib/Utils/WinImplBase.cpp b/DuiLib/Utils/WinImplBase.cpp
@@ -143,6 +143,21 @@ namespace DuiLib
 
 		RECT rcClient;
 		::GetClientRect(*this, &rcClient);
+		
+		CControlUI* pMaxBtn = static_cast<CControlUI*>(m_pm.FindControl(_T("maxbtn")));
+		CControlUI* pRestoreBtn = static_cast<CControlUI*>(m_pm.FindControl(_T("restorebtn")));
+		if (pMaxBtn && pMaxBtn->IsVisible()) {
+			RECT rcBtn = pMaxBtn->GetPos();
+			if (::PtInRect(&rcBtn, pt)) {
+				return HTMAXBUTTON;
+			}
+		}
+		else if (pRestoreBtn && pRestoreBtn->IsVisible()) {
+			RECT rcBtn = pRestoreBtn->GetPos();
+			if (::PtInRect(&rcBtn, pt)) {
+				return HTMAXBUTTON;
+			}
+		}
 
 		if (!::IsZoomed(*this))
 		{
@@ -232,6 +247,13 @@ namespace DuiLib
 			HRGN hRgn = ::CreateRoundRectRgn(rcWnd.left, rcWnd.top, rcWnd.right, rcWnd.bottom, szRoundCorner.cx, szRoundCorner.cy);
 			::SetWindowRgn(*this, hRgn, TRUE);
 			::DeleteObject(hRgn);
+
+			if (m_pm.IsValid() && wParam == SIZE_RESTORED) {
+				CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(_T("maxbtn")));
+				if (pControl) pControl->SetVisible(true);
+				pControl = static_cast<CControlUI*>(m_pm.FindControl(_T("restorebtn")));
+				if (pControl) pControl->SetVisible(false);
+			}
 		}
 #endif
 		bHandled = FALSE;
@@ -364,6 +386,45 @@ namespace DuiLib
 		case WM_NCCALCSIZE:		lRes = OnNcCalcSize(uMsg, wParam, lParam, bHandled); break;
 		case WM_NCPAINT:		lRes = OnNcPaint(uMsg, wParam, lParam, bHandled); break;
 		case WM_NCHITTEST:		lRes = OnNcHitTest(uMsg, wParam, lParam, bHandled); break;
+		case WM_NCLBUTTONDOWN:
+		case WM_NCLBUTTONUP:
+		case WM_NCLBUTTONDBLCLK: {
+			if (wParam == HTMAXBUTTON) {
+				POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+				::ScreenToClient(m_hWnd, &pt);
+				LPARAM param = MAKELPARAM(pt.x, pt.y);
+				if (uMsg == WM_NCLBUTTONDOWN) {
+					::SendMessage(m_hWnd, WM_LBUTTONDOWN, wParam, param);
+				}
+				else if (uMsg == WM_NCLBUTTONUP) {
+					::SendMessage(m_hWnd, WM_LBUTTONUP, wParam, param);
+				}
+				return 0;
+			}
+			bHandled = FALSE;
+			break;
+		}
+		case WM_NCMOUSEHOVER:
+		case WM_NCMOUSELEAVE:
+		case WM_NCMOUSEMOVE: {
+			if (wParam == HTMAXBUTTON) {
+				POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+				::ScreenToClient(m_hWnd, &pt);
+				LPARAM param = MAKELPARAM(pt.x, pt.y);
+				if (uMsg == WM_NCMOUSEHOVER) {
+					//::SendMessage(m_hWnd, WM_MOUSEHOVER, wParam, param);
+				}
+				else if (uMsg == WM_NCMOUSELEAVE) {
+					//::SendMessage(m_hWnd, WM_MOUSELEAVE, wParam, param);
+				}
+				else {
+					::SendMessage(m_hWnd, WM_MOUSEMOVE, wParam, param);
+				}
+				return 0;
+			}
+			bHandled = FALSE;
+			break;
+		}
 		case WM_GETMINMAXINFO:	lRes = OnGetMinMaxInfo(uMsg, wParam, lParam, bHandled); break;
 		case WM_MOUSEWHEEL:		lRes = OnMouseWheel(uMsg, wParam, lParam, bHandled); break;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1966,6 +1966,11 @@ namespace DuiLib {`
`1966`	`1966`	`::InvalidateRect(m_hWndPaint, &rcItem, FALSE);`
`1967`	`1967`	`}`
`1968`	`1968`
	`1969`	`+ bool CPaintManagerUI::IsValid()`
	`1970`	`+ {`
	`1971`	`+ return m_hWndPaint != NULL && m_pRoot != NULL;`
	`1972`	`+ }`
	`1973`	`+`
`1969`	`1974`	`bool CPaintManagerUI::AttachDialog(CControlUI* pControl)`
`1970`	`1975`	`{`
`1971`	`1976`	`ASSERT(::IsWindow(m_hWndPaint));`