summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua8
-rw-r--r--Data/Libraries/GameLab/Editor/Window/GUIWindow.lua16
-rw-r--r--Data/Scripts/EditorApplication.lua2
3 files changed, 13 insertions, 13 deletions
diff --git a/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
index 4852b16..bc7cd82 100644
--- a/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
@@ -11,6 +11,10 @@ ContainerWindow.Ctor = function(self, position, showMode, min, max)
self.m_RootSplitWindow = Window.SplitWindow.New(Window.ESplitMode.Horizontal)
end
+ContainerWindow.get_native = function(self)
+ return self.m_Native
+end
+
ContainerWindow.SetTitle = function(self, title)
self.m_Native:SetTitle(title)
end
@@ -19,10 +23,6 @@ ContainerWindow.SetIcon = function(self)
self.m_Native:SetIcon(self)
end
-ContainerWindow.GetNative = function(self)
- return self.m_Native
-end
-
ContainerWindow.GetSize = function(self)
return self.m_Native:GetSize()
end
diff --git a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
index e434aed..83e25c3 100644
--- a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
@@ -25,7 +25,7 @@ local col = {
}
GUIWindow.Ctor = function(self)
- self.m_Native = NativeGUIWindow.New(self)
+ self.m_Native = NativeGUIWindow.New(self) -- native guiwindow
self.m_ContainerWindow = nil
self.m_SplitWindow = nil -- parent window
self.m_Position = Rect(0,0,0,0) -- 在父ContainerWindow中的位置和大小
@@ -36,6 +36,10 @@ GUIWindow.Ctor = function(self)
self.m_ClearColor = col[i]
end
+GUIWindow.get_native = function(self)
+ return self.m_Native
+end
+
GUIWindow.get_editorWindows = function(self)
return self.m_EditorWindows
end
@@ -58,7 +62,7 @@ end
GUIWindow.set_position = function(self, position)
self.m_Position:Set(position)
- self.m_Native:SetPosition({position.x, position.y, position.width, position.height})
+ self.native:SetPosition({position.x, position.y, position.width, position.height})
end
GUIWindow.Start = function(self)
@@ -71,7 +75,7 @@ end
GUIWindow.SetContainerWindow = function(self, containerWindow)
self.m_ContainerWindow = containerWindow
- self.m_Native:SetContainerWindow(containerWindow:GetNative())
+ self.native:SetContainerWindow(containerWindow.native)
end
GUIWindow.AddEditorWindow = function(self, editorWindow)
@@ -80,17 +84,13 @@ end
GUIWindow.SetPosition = function(self, pos)
self.m_Position:Set(pos)
- self.m_Native:SetPosition({pos.x, pos.y, pos.width, pos.height})
+ self.native:SetPosition({pos.x, pos.y, pos.width, pos.height})
end
GUIWindow.GetPosition = function(self)
return self.m_Position
end
-GUIWindow.GetNative = function(self)
- return self.m_Native
-end
-
-- 最主要的回调函数,同时处理窗口管理、事件、布局、渲染
GUIWindow.OnGUI = function(self)
Debug.Log("OnGUI")
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 76c4f3d..aaa0a5e 100644
--- a/Data/Scripts/EditorApplication.lua
+++ b/Data/Scripts/EditorApplication.lua
@@ -23,7 +23,7 @@ local mainWindow = Window.ContainerWindow.New({400, 400, 800, 500}, Window.EShow
mainWindow:SetTitle("GameLab")
mainWindow:SetIcon("./Data/Icon/GameLab.ico")
-app:SetMainWindow(mainWindow:GetNative())
+app:SetMainWindow(mainWindow.native)
EditorWindowManager.SetMainWindow(mainWindow)
EditorWindowManager.TestGUIWindow()