diff options
| -rw-r--r-- | Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua | 30 | ||||
| -rw-r--r-- | Data/Libraries/GameLab/Editor/Window/GUIWindow.lua | 13 | ||||
| -rw-r--r-- | Data/Libraries/GameLab/Editor/Window/init.lua | 13 | ||||
| -rw-r--r-- | Editor/GUI/GUIWindow.h | 5 |
4 files changed, 45 insertions, 16 deletions
diff --git a/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua b/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua index acf0737..7ed156b 100644 --- a/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua +++ b/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua @@ -23,7 +23,7 @@ GUI.EndFrame = function() end
------------------------------------------------------------------------------------------------
--- 控件
+-- Controls
------------------------------------------------------------------------------------------------
GUI.Button = function(rect, content )
@@ -42,4 +42,32 @@ GUI.Box = function() end
+GUI.HorizontalSlider = function()
+
+end
+
+GUI.VerticalSlider = function()
+
+end
+
+GUI.TextField = function()
+
+end
+
+GUI.TextArea = function()
+
+end
+
+GUI.Toolbar = function()
+
+end
+
+GUI.VerticalScrollbar = function()
+
+end
+
+GUI.HorizontalScrollbar = function()
+
+end
+
return GUI
\ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua index 6e15c9d..483f2b3 100644 --- a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua +++ b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua @@ -1,15 +1,4 @@ ---[[
-GameLab编辑器窗口
-
-窗口层级 触发事件 逻辑窗口 数量 说明
-ContainerWindow 是 [1,n] 有唯一的一个MainWindow，可以有多个其余ShowMode的窗口
-|- SplitWindow 是 1:1 一个ContainerWindow下只有一个root SplitWindow，然后以树形结构嵌套子窗口GUIWindow或SplitWindow
- |- GUIWindow 是 1:[n,0] 一个SplitWindow下可能有GUIWindow，也可能是SplitWindow
- |- EditorWindow 是 1:[n,1] 一个GUIWindow下至少有一个EditorWindow
-
-ContinerWindow和GUIWindow是windows事件产生的窗口，SplitWindow和EditorWindow是逻辑窗口，本身不会
-产生输入事件
-]]
+
local GUIWindow = GameLab.GlobalClass("GameLab.Editor.Window.GUIWindow")
local NativeGUIWindow = GameLab.Editor.Window.Internal.GUIWindow
diff --git a/Data/Libraries/GameLab/Editor/Window/init.lua b/Data/Libraries/GameLab/Editor/Window/init.lua index 238dc1b..ff99dd9 100644 --- a/Data/Libraries/GameLab/Editor/Window/init.lua +++ b/Data/Libraries/GameLab/Editor/Window/init.lua @@ -5,4 +5,17 @@ import("ContainerWindow") import("GUIWindow")
import("SplitWindow")
+--[[
+GameLab编辑器窗口
+
+窗口层级 触发事件 逻辑窗口 数量 说明
+ContainerWindow 是 [1,n] 有唯一的一个MainWindow，可以有多个其余ShowMode的窗口
+|- SplitWindow 是 1:1 一个ContainerWindow下只有一个root SplitWindow，然后以树形结构嵌套子窗口GUIWindow或SplitWindow
+ |- GUIWindow 是 1:[n,0] 一个SplitWindow下可能有GUIWindow，也可能是SplitWindow
+ |- EditorWindow 是 1:[n,1] 一个GUIWindow下至少有一个EditorWindow
+
+ContinerWindow和GUIWindow是windows事件产生的窗口，SplitWindow和EditorWindow是逻辑窗口，本身不会
+产生输入事件
+]]
+
return m
\ No newline at end of file diff --git a/Editor/GUI/GUIWindow.h b/Editor/GUI/GUIWindow.h index 06d8a17..aed38d9 100644 --- a/Editor/GUI/GUIWindow.h +++ b/Editor/GUI/GUIWindow.h @@ -42,7 +42,7 @@ private: void ProcessEventMessages(UINT message, WPARAM wParam, LPARAM lParam); bool SetRenderContext(); - //----------------------------------------------------------------- + //-------------------------------------------------- std::string m_Name; @@ -54,7 +54,7 @@ private: HWND m_Handle; HDC m_DC; - //----------------------------------------------------------------- + //-------------------------------------------------- LUA_BIND_DECL_CLASS(GUIWindow); @@ -65,4 +65,3 @@ private: LUA_BIND_DECL_METHOD(_SetPosition); }; - |