WIP: Add support for per-monitor DPI awareness (15)

WinMerge · sdottaka · Aug 30, 2020 · Aug 31, 2020 · Sep 1, 2020 · Sep 2, 2020
commit aefc0ddad96885c3336854a15d833723eb021219
diff --git a/Externals/crystaledit/Sample/ChildFrm.cpp b/Externals/crystaledit/Sample/ChildFrm.cpp
@@ -5,6 +5,7 @@
 #include "Sample.h"
 
 #include "ChildFrm.h"
+#include "MainFrm.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -42,8 +43,21 @@ BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
 	// TODO: Modify the Window class or styles here by modifying
 	//  the CREATESTRUCT cs
-
-	return __super::PreCreateWindow(cs);
+	MDITileLayout::LayoutManager& layoutManager = static_cast<CMainFrame*>(AfxGetMainWnd())->GetLayoutManager();
+	if (!layoutManager.GetTileLayoutEnabled())
+		return __super::PreCreateWindow(cs);
+	__super::PreCreateWindow(cs);
+	cs.style &= ~WS_CAPTION;
+	CRect rcMain;
+	CWnd* pWndMDIClient = AfxGetMainWnd()->FindWindowEx(AfxGetMainWnd()->m_hWnd, nullptr, _T("MDIClient"), nullptr);
+	pWndMDIClient->GetWindowRect(rcMain);
+	CRect rc = layoutManager.GetDefaultOpenPaneRect();
+	AdjustWindowRectEx(rc, cs.style, false, cs.dwExStyle);
+	cs.x = rc.left - rcMain.left;
+	cs.y = rc.top - rcMain.top;
+	cs.cx = rc.Width();
+	cs.cy = rc.Height();
+	return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -67,9 +81,16 @@ void CChildFrame::Dump(CDumpContext& dc) const
 
 BOOL CChildFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) 
 {
+	static_cast<CMainFrame*>(AfxGetMainWnd())->GetLayoutManager().NotifyChildOpened(this);
 	return m_wndSplitter.Create(this, 2, 2, CSize(30, 30), pContext);
 }
 
+BOOL CChildFrame::DestroyWindow()
+{
+	static_cast<CMainFrame*>(AfxGetMainWnd())->GetLayoutManager().NotifyChildClosed(this);
+	return __super::DestroyWindow();
+}
+
 void CChildFrame::OnSize(UINT nType, int cx, int cy)
 {
 	__super::OnSize(nType, cx, cy);
@@ -82,5 +103,6 @@ void CChildFrame::OnSize(UINT nType, int cx, int cy)
 		AdjustWindowRectEx(&rc, GetStyle(), FALSE, GetExStyle());
 		SetWindowPos(nullptr, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_NOZORDER | SWP_NOACTIVATE);
 	}
+	static_cast<CMainFrame*>(AfxGetMainWnd())->GetLayoutManager().NotifyChildResized(this);
 }
 
diff --git a/Externals/crystaledit/Sample/ChildFrm.h b/Externals/crystaledit/Sample/ChildFrm.h
@@ -26,6 +26,7 @@ class CChildFrame : public DpiAware::CDpiAwareWnd<CMDIChildWnd>
 	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
 	protected:
 	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
+    virtual BOOL DestroyWindow();
 	//}}AFX_VIRTUAL
 
 // Implementation

diff --git a/Externals/crystaledit/Sample/MainFrm.cpp b/Externals/crystaledit/Sample/MainFrm.cpp
@@ -24,6 +24,14 @@ BEGIN_MESSAGE_MAP(CMainFrame, DpiAware::CDpiAwareWnd<CMDIFrameWnd>)
 		// NOTE - the ClassWizard will add and remove mapping macros here.
 		//    DO NOT EDIT what you see in these blocks of generated code !
 	ON_WM_CREATE()
+	ON_WM_SIZE()
+	ON_COMMAND_EX(ID_WINDOW_ARRANGE, OnMDIWindowCmd)
+	ON_COMMAND_EX(ID_WINDOW_CASCADE, OnMDIWindowCmd)
+	ON_COMMAND_EX(ID_WINDOW_TILE_HORZ, OnMDIWindowCmd)
+	ON_COMMAND_EX(ID_WINDOW_TILE_VERT, OnMDIWindowCmd)
+	ON_COMMAND_EX(ID_WINDOW_SPLIT_VERTICALLY, OnWindowSplit)
+	ON_COMMAND_EX(ID_WINDOW_SPLIT_HORIZONTALLY, OnWindowSplit)
+	ON_COMMAND(ID_WINDOW_COMBINE, OnWindowCombine)
 	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -45,7 +53,7 @@ static UINT indicators[] =
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame construction/destruction
 
-CMainFrame::CMainFrame()
+CMainFrame::CMainFrame() : m_layoutManager(this)
 {
 	// TODO: add member initialization code here
 
@@ -88,19 +96,6 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	return 0;
 }
 
-LRESULT CMainFrame::OnDpiChanged(WPARAM wParam, LPARAM lParam)
-{
-	__super::OnDpiChanged(wParam, lParam);
-	DpiAware::UpdateAfxDataSysMetrics(GetDpi());
-	LoadToolBar();
-	const RECT* pRect = reinterpret_cast<RECT *>(lParam);
-	SetWindowPos(nullptr, pRect->left, pRect->top,
-		pRect->right - pRect->left,
-		pRect->bottom - pRect->top, SWP_NOZORDER | SWP_NOACTIVATE);
-	Default();
-	return 0;
-}
-
 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
 	// TODO: Modify the Window class or styles here by modifying
@@ -147,3 +142,54 @@ void CMainFrame::Dump(CDumpContext& dc) const
 
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame message handlers
+
+BOOL CMainFrame::OnMDIWindowCmd(UINT nID)
+{
+	switch (nID)
+	{
+	case ID_WINDOW_TILE_HORZ:
+	case ID_WINDOW_TILE_VERT:
+	{
+		bool bHorizontal = (nID == ID_WINDOW_TILE_HORZ);
+		m_layoutManager.SetTileLayoutEnabled(true);
+		m_layoutManager.Tile(bHorizontal);
+		break;
+	}
+	case ID_WINDOW_CASCADE:
+		m_layoutManager.SetTileLayoutEnabled(false);
+		__super::OnMDIWindowCmd(nID);
+		break;
+	}
+	return 0;
+}
+
+BOOL CMainFrame::OnWindowSplit(UINT nID)
+{
+	m_layoutManager.SplitActivePane(nID == ID_WINDOW_SPLIT_HORIZONTALLY, 0.5);
+	return 0;
+}
+
+void CMainFrame::OnWindowCombine()
+{
+	m_layoutManager.CombineActivePane();
+}
+
+void CMainFrame::OnSize(UINT nType, int cx, int cy)
+{
+	__super::OnSize(nType, cx, cy);
+	m_layoutManager.NotifyMainResized();
+}
+
+LRESULT CMainFrame::OnDpiChanged(WPARAM wParam, LPARAM lParam)
+{
+	__super::OnDpiChanged(wParam, lParam);
+	DpiAware::UpdateAfxDataSysMetrics(GetDpi());
+	LoadToolBar();
+	const RECT* pRect = reinterpret_cast<RECT *>(lParam);
+	SetWindowPos(nullptr, pRect->left, pRect->top,
+		pRect->right - pRect->left,
+		pRect->bottom - pRect->top, SWP_NOZORDER | SWP_NOACTIVATE);
+	Default();
+	return 0;
+}
+
diff --git a/Externals/crystaledit/Sample/MainFrm.h b/Externals/crystaledit/Sample/MainFrm.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include "utils/DpiAware.h"
+#include "utils/MDITileLayout.h"
 
 class CMainFrame : public DpiAware::CDpiAwareWnd<CMDIFrameWnd>
 {
@@ -32,18 +33,25 @@ class CMainFrame : public DpiAware::CDpiAwareWnd<CMDIFrameWnd>
 	virtual void Dump(CDumpContext& dc) const;
 #endif
 	BOOL LoadToolBar();
+	MDITileLayout::LayoutManager& GetLayoutManager() { return m_layoutManager; };
 
 protected:  // control bar embedded members
 	CStatusBar  m_wndStatusBar;
 	CToolBar    m_wndToolBar;
 	CImageList  m_imgListToolBar;
+	CSplitterWnd m_wndSplitter;
+	MDITileLayout::LayoutManager m_layoutManager;
 
 // Generated message map functions
 protected:
 	//{{AFX_MSG(CMainFrame)
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 		// NOTE - the ClassWizard will add and remove member functions here.
 		//    DO NOT EDIT what you see in these blocks of generated code!
+	afx_msg BOOL OnMDIWindowCmd(UINT nID);
+	afx_msg BOOL OnWindowSplit(UINT nID);
+	afx_msg void OnWindowCombine();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
 	//}}AFX_MSG
 	afx_msg LRESULT OnDpiChanged(WPARAM wParam, LPARAM lParam);
 	DECLARE_MESSAGE_MAP()

diff --git a/Externals/crystaledit/Sample/Sample.rc b/Externals/crystaledit/Sample/Sample.rc
@@ -197,8 +197,12 @@ BEGIN
     BEGIN
         MENUITEM "&New Window",                 ID_WINDOW_NEW
         MENUITEM "&Cascade",                    ID_WINDOW_CASCADE
-        MENUITEM "&Tile",                       ID_WINDOW_TILE_HORZ
+        MENUITEM "Tile &Vertically",            ID_WINDOW_TILE_VERT
+        MENUITEM "Tile &Horizontally",          ID_WINDOW_TILE_HORZ
         MENUITEM "&Arrange Icons",              ID_WINDOW_ARRANGE
+        MENUITEM "Split V&ertically",           ID_WINDOW_SPLIT_VERTICALLY
+        MENUITEM "Split H&orizontally",         ID_WINDOW_SPLIT_HORIZONTALLY
+        MENUITEM "Com&bine",                    ID_WINDOW_COMBINE
     END
     POPUP "&Help"
     BEGIN

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
@@ -585,6 +585,7 @@
     <ClCompile Include="..\editlib\parsers\po.cpp" />
     <ClCompile Include="..\editlib\parsers\powershell.cpp" />
     <ClCompile Include="..\editlib\parsers\python.cpp" />
+    <ClCompile Include="..\editlib\utils\MDITileLayout.cpp" />
     <ClCompile Include="..\editlib\utils\registry.cpp" />
     <ClCompile Include="..\editlib\parsers\rexx.cpp" />
     <ClCompile Include="..\editlib\parsers\rsrc.cpp" />
@@ -647,7 +648,7 @@
     <ClInclude Include="..\editlib\LineInfo.h" />
     <ClInclude Include="..\editlib\parsers\crystallineparser.h" />
     <ClInclude Include="..\editlib\dialogs\memcombo.h" />
-    <ClInclude Include="..\editlib\utils\mfc_templ_defines.h" />
+    <ClInclude Include="..\editlib\utils\MDITileLayout.h" />
     <ClInclude Include="..\editlib\utils\registry.h" />
     <ClInclude Include="..\editlib\utils\string_util.h" />
     <ClInclude Include="..\editlib\SyntaxColors.h" />

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
@@ -584,6 +584,7 @@
     <ClCompile Include="..\editlib\parsers\po.cpp" />
     <ClCompile Include="..\editlib\parsers\powershell.cpp" />
     <ClCompile Include="..\editlib\parsers\python.cpp" />
+    <ClCompile Include="..\editlib\utils\MDITileLayout.cpp" />
     <ClCompile Include="..\editlib\utils\registry.cpp" />
     <ClCompile Include="..\editlib\parsers\rexx.cpp" />
     <ClCompile Include="..\editlib\parsers\rsrc.cpp" />
@@ -646,6 +647,7 @@
     <ClInclude Include="..\editlib\LineInfo.h" />
     <ClInclude Include="..\editlib\parsers\crystallineparser.h" />
     <ClInclude Include="..\editlib\dialogs\memcombo.h" />
+    <ClInclude Include="..\editlib\utils\MDITileLayout.h" />
     <ClInclude Include="..\editlib\utils\registry.h" />
     <ClInclude Include="..\editlib\utils\string_util.h" />
     <ClInclude Include="..\editlib\SyntaxColors.h" />

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
@@ -255,6 +255,9 @@
     <ClCompile Include="..\editlib\utils\DpiAware.cpp">
       <Filter>editlib\utils</Filter>
     </ClCompile>
+    <ClCompile Include="..\editlib\utils\MDITileLayout.cpp">
+      <Filter>editlib\utils</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Sample.rc">
@@ -385,6 +388,9 @@
     <ClInclude Include="..\editlib\utils\DpiAware.h">
       <Filter>editlib\utils</Filter>
     </ClInclude>
+    <ClInclude Include="..\editlib\utils\MDITileLayout.h">
+      <Filter>editlib\utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\mg_icons.bmp">

diff --git a/Externals/crystaledit/Sample/resource.h b/Externals/crystaledit/Sample/resource.h
@@ -51,6 +51,9 @@
 #define ID_EDIT_DISABLEDRAGANDDROP      32797
 #define ID_EDIT_FIND_PREVIOUS           32799
 #define ID_VIEW_WHITESPACE              32800
+#define ID_WINDOW_SPLIT_VERTICALLY      32801
+#define ID_WINDOW_SPLIT_HORIZONTALLY    32802
+#define ID_WINDOW_COMBINE               32803
 #define ID_EDIT_INDICATOR_COL           37900
 #define ID_READ_ONLY                    37901
 #define ID_INDICATOR_ENCODING           37905
@@ -62,7 +65,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        135
-#define _APS_NEXT_COMMAND_VALUE         32802
+#define _APS_NEXT_COMMAND_VALUE         32804
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           101
 #endif