*misc

1 files changed, 23 insertions, 10 deletions

diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h
index a8c96ad..d8a3f66 100644
--- a/Editor/GUI/EditorWindows.h
+++ b/Editor/GUI/EditorWindows.h
@@ -75,10 +75,10 @@ public:
 private:
 	bool SetRenderContext();
 
+    //--------------------------------------------------------
+
 	std::string m_Name;
 
-	HWND m_Window;
-	HDC m_DC;
 	POINT m_Size;
     ShowMode m_ShowMode; // 窗口类型
     bool  m_IsClosing;
@@ -88,6 +88,13 @@ private:
     POINT m_MinSize;
     POINT m_MaxSize;
 
+#ifdef GAMELAB_WIN
+    HWND m_Window;
+    HDC  m_DC;
+#endif
+
+    //--------------------------------------------------------
+
 	LUA_BIND_DECL_CLASS(ContainerWindow);
 
     LUA_BIND_DECL_METHOD(_New);
@@ -97,12 +104,11 @@ private:
 
 };
 
-// 窗口基类
 class WindowBase 
 {
 };
 
-// 抽象窗口，用来做布局
+// 抽象窗口，用来做布局，SplitWindow是嵌套的
 class SplitWindow : public WindowBase
 {
 public: 
@@ -119,7 +125,10 @@ public:
 private:
 	SplitMode m_SplitMode;
 
-	GUIWindow* m_GUIWindow;
+    // 嵌套split
+    std::vector< SplitWindow*> m_ChildSplitWindows;
+
+    // 最顶层的split window包含的是GUIWindows
 	std::vector<GUIWindow*>* m_GUIWindows;
 
 };
@@ -158,12 +167,17 @@ private:
 	std::string m_Name; 
 
 	ContainerWindow* m_ContainerWindow;
-	HWND m_Handle;
-	HDC m_DC;
 
-	std::vector<LuaBind::MemberRef> m_EditorWindows;
+    std::vector<LuaBind::MemberRef> m_EditorWindows;
     LuaBind::MemberRef m_EditorWindow; // EditorWindow脚本
-	LuaBind::MemberRef m_Script; // EditorWindow脚本
+    LuaBind::MemberRef m_ActiveEditorWindow; // 当前激活的EditorWindow
+
+    LuaBind::MemberRef m_Script; // EditorWindow脚本
+
+#if GAMELAB_WIN
+	HWND m_Handle;
+	HDC  m_DC;
+#endif
 
     //-----------------------------------------------------------------
 
@@ -174,7 +188,6 @@ private:
     LUA_BIND_DECL_METHOD(_Focus);
     LUA_BIND_DECL_METHOD(_SetContainerWindow);
     LUA_BIND_DECL_METHOD(_SetPosition);
-
 	LUA_BIND_DECL_METHOD(_SetInstance);
 
 };