POC CTimelineView now working inside splitter and TabItem

Author: janwilmans

GDIGraphicsPOC/CMainFrame2.cpp

@@ -31,10 +31,7 @@ LRESULT fusion::CMainFrame2::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, B
     GetClientRect(&rect);
     rect.bottom = 540; // 40x 13 = 520, + 20 for colomn header
 
-    // here class Reflector is used, but I could also just have added REFLECT_NOTIFICATIONS() to the MSG_MAP of class CMainFrame2 (tested both, both work)
-    m_reflector.Create(*this, rect, L"", WS_CHILD | WS_VISIBLE);
-    m_reflector.GetClientRect(&rect);
-    m_logview.Create(m_reflector, rect);
+    m_logview.Create(*this, rect);
     AddDummyContent(m_logview);
     return 0;
 }

GDIGraphicsPOC/CMainFrame2.h

@@ -30,25 +30,25 @@ namespace fusion {
 class CMainFrame2 : public WTL::CFrameWindowImpl<CMainFrame2, ATL::CWindow, ATL::CFrameWinTraits>
 {
 public:
-    DECLARE_FRAME_WND_CLASS(_T("First WTL window"), IDR_MAINFRAME);
-
-    BEGIN_MSG_MAP(CMainFrame2)
-        MESSAGE_HANDLER(WM_CREATE, OnCreate)
-        MESSAGE_HANDLER(WM_CLOSE, OnClose)
-        MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
-        MSG_WM_SIZE(OnSize)
-        CHAIN_MSG_MAP(CFrameWindowImpl<CMainFrame2>)
-        DEFAULT_REFLECTION_HANDLER()
-    END_MSG_MAP()
-
-    LRESULT OnSize(UINT nType, CSize Extent);
-    LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-    LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-    LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	DECLARE_FRAME_WND_CLASS(_T("First WTL window"), IDR_MAINFRAME);
+
+	BEGIN_MSG_MAP(CMainFrame2)
+		MESSAGE_HANDLER(WM_CREATE, OnCreate)
+		MESSAGE_HANDLER(WM_CLOSE, OnClose)
+		MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
+		MSG_WM_SIZE(OnSize)
+		CHAIN_MSG_MAP(CFrameWindowImpl<CMainFrame2>)
+		DEFAULT_REFLECTION_HANDLER()
+		REFLECT_NOTIFICATIONS()
+	END_MSG_MAP()
+
+	LRESULT OnSize(UINT nType, CSize Extent);
+	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 private:
-    CLogView m_logview;
-    Reflector m_reflector;
+	CLogView m_logview;
 };
 
 } // namespace fusion

GDIGraphicsPOC/Logview.h

@@ -20,15 +20,6 @@
 
 namespace fusion {
 
-class Reflector : public CWindowImpl<Reflector>
-{
-public:
-    DECLARE_WND_CLASS_EX(_T("MyReflectorWindow"), 0, -1)
-    BEGIN_MSG_MAP(Reflector)
-        REFLECT_NOTIFICATIONS()
-    END_MSG_MAP()
-};
-
 template <typename T>
 void AddDummyContent(T& t)
 {

GDIGraphicsPOC/MainFrame.cpp

@@ -10,7 +10,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR szCmdLine, int nC
     // CMainFrame is a CTabbedFrameImpl<> and does not render as intended
     // CMainFrame2 is a CFrameWindowImpl<> and _does_ render as intended
 
-    fusion::CMainFrame wndMain;
+    fusion::CMainFrame2 wndMain;
 
     // Create & show our main window
     if (nullptr == wndMain.Create(nullptr, CWindow::rcDefault, _T("WTL Frame"), WS_OVERLAPPEDWINDOW))
@@ -75,4 +75,4 @@ namespace fusion
         return 0;
     }
 
-}
+}

GDIGraphicsPOC/TabItem.h

@@ -69,6 +69,17 @@ inline std::wstring FormatDuration(double seconds)
 	return wstringbuilder() << std::fixed << std::setprecision(3) << seconds << L" " << *unit;
 }
 
+class CMyPaneContainer : public CPaneContainerImpl<CMyPaneContainer>
+{
+public:
+	DECLARE_WND_CLASS_EX(_T("MY_PaneContainer"), 0, -1)
+
+	BEGIN_MSG_MAP(CMyPaneContainerImpl)
+		REFLECT_NOTIFICATIONS()
+		CHAIN_MSG_MAP(CPaneContainerImpl<CMyPaneContainer>)
+	END_MSG_MAP()
+};
+
 template <typename T>
 class TabItem : public CTabViewTabItem
 {
@@ -83,7 +94,7 @@ class TabItem : public CTabViewTabItem
 		return m_timelineView;
 	}
 
-	void DisablePaneHeader(CPaneContainer& panecontainer)
+	void DisablePaneHeader(CMyPaneContainer& panecontainer)
 	{
 		panecontainer.SetPaneContainerExtendedStyle(PANECNT_NOCLOSEBUTTON, 0);
 		panecontainer.m_cxyHeader = 0;
@@ -104,6 +115,8 @@ class TabItem : public CTabViewTabItem
 		m_bottom.Create(m_split, L"");
 		m_split.SetSplitterPanes(m_top, m_bottom, true);
 		m_split.SetSplitterPos(560);
+		m_split.UpdateProportionalPos();
+		m_split.Invalidate();
 
 		DisablePaneHeader(m_top);
 		DisablePaneHeader(m_bottom);
@@ -112,8 +125,8 @@ class TabItem : public CTabViewTabItem
 private:
 	T m_logview;
 	CHorSplitterWindow m_split;
-	CPaneContainer m_top;
-	CPaneContainer m_bottom;
+	CMyPaneContainer m_top;
+	CMyPaneContainer m_bottom;
 };
 
 using CLogViewTabItem2 = TabItem<CLogView>;