* rename Editor.GUI to Editor.Window

7 files changed, 26 insertions, 31 deletions

diff --git a/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua b/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua
deleted file mode 100644
index 334b569..0000000
--- a/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local imgui = GameLab.Editor.GUI or {} 

-GameLab.Editor.GUI = imgui

-

-local Event = GameLab.Events.Event 

-

-imgui.Button = function()

-    

-end

-

-return imgui 
\ No newline at end of file
diff --git a/Data/Libraries/GameLab/Editor/GUI/init.lua b/Data/Libraries/GameLab/Editor/GUI/init.lua
deleted file mode 100644
index 5507a16..0000000
--- a/Data/Libraries/GameLab/Editor/GUI/init.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-GameLab.Editor.GUI = GameLab.Editor.GUI or {}

-local m = GameLab.Editor.GUI

-

-local import = GameLab.import(...)

-

-import("ContainerWindow")

-import("GUIWindow")

-

-return m
\ No newline at end of file
diff --git a/Data/Libraries/GameLab/Editor/GUI/ContainerWindow.lua b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
index b270110..2936101 100644
--- a/Data/Libraries/GameLab/Editor/GUI/ContainerWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
@@ -1,5 +1,5 @@
-local NativeContainWidow = GameLab.Editor.GUI.Internal.ContainerWindow
-local ContainerWindow = GameLab.GlobalClass("GameLab.Editor.GUI.ContainerWindow")
+local NativeContainWidow = GameLab.Editor.Window.Internal.ContainerWindow
+local ContainerWindow = GameLab.GlobalClass("GameLab.Editor.Window.ContainerWindow")
 
 ContainerWindow.Ctor = function(self, position, showMode, min, max)
     self.m_Native = NativeContainWidow.New(position, showMode, min, max)
diff --git a/Data/Libraries/GameLab/Editor/GUI/FontManager.lua b/Data/Libraries/GameLab/Editor/Window/FontManager.lua
index e69de29..e69de29 100644
--- a/Data/Libraries/GameLab/Editor/GUI/FontManager.lua
+++ b/Data/Libraries/GameLab/Editor/Window/FontManager.lua
diff --git a/Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
index 8165faa..cb05518 100644
--- a/Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
@@ -1,5 +1,5 @@
-local GUIWindow = GameLab.GlobalClass("GameLab.Editor.GUI.GUIWindow")

-local NativeGUIWindow = GameLab.Editor.GUI.Internal.GUIWindow 

+local GUIWindow = GameLab.GlobalClass("GameLab.Editor.Window.GUIWindow")

+local NativeGUIWindow = GameLab.Editor.Window.Internal.GUIWindow 

 

 local inspect = require("inspect")

 

@@ -8,7 +8,8 @@ local GL        = GameLab.Engine.GL
 local Math      = GameLab.Engine.Math

 local Rendering = GameLab.Engine.Rendering

 

-local Rect = Math.Rect

+local Rect  = Math.Rect

+local Event = GameLab.Events.Event

 

 local i = 0

 local col = {

@@ -45,8 +46,12 @@ end
 GUIWindow.OnGUI = function(self)

     self:ClearBackground()

 

-        

-end

+    local event = Event.current

+

+    if self.m_SplitWindow then 

+        self.m_SplitWindow:DoSplit(event)

+    end 

+end 

 

 GUIWindow.GetContainerWindow = function(self)

     return self.m_ContainerWindow

diff --git a/Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua b/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua
index 214eed6..f5d410c 100644
--- a/Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua
@@ -1,13 +1,13 @@
-local Splitter = GameLab.Class("GameLab.Editor.GUI.Internal.Splitter")
+local Splitter = GameLab.Class("GameLab.Editor.Window.Internal.Splitter")
 
 Splitter.Ctor = function(self) 
     self.width = 10
 end  
 
 -- 抽象的窗口，用来处理布局
-local SplitWindow = GameLab.GlobalClass("GameLab.Editor.GUI.SplitWindow")
+local SplitWindow = GameLab.GlobalClass("GameLab.Editor.Window.SplitWindow")
 
-local ESplitMode = GameLab.GlobalEnum("GameLab.Editor.GUI.ESplitMode", {
+local ESplitMode = GameLab.GlobalEnum("GameLab.Editor.Window.ESplitMode", {
     "Vertical",
     "Horizontal" 
 })
@@ -20,8 +20,8 @@ SplitWindow.Ctor = function(self)
     self.m_SubSplit   = {} -- 子节点也是split windows 
 end
 
-SplitWindow.DoSplit = function(self)
-
+SplitWindow.DoSplit = function(self, event)
+    
 end
 
 -- 返回guiWnd
diff --git a/Data/Libraries/GameLab/Editor/Window/init.lua b/Data/Libraries/GameLab/Editor/Window/init.lua
new file mode 100644
index 0000000..07f2a92
--- /dev/null
+++ b/Data/Libraries/GameLab/Editor/Window/init.lua
@@ -0,0 +1,9 @@
+GameLab.Editor.Window = GameLab.Editor.Window or {}

+local m = GameLab.Editor.Window

+

+local import = GameLab.import(...)

+

+import("ContainerWindow")

+import("GUIWindow")

+

+return m
\ No newline at end of file