From d8417b03b9c2a820d3d3be0dfa80841b4d1f4c04 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 9 Nov 2021 19:22:13 +0800 Subject: *misc --- Data/Scripts/EditorApplication.lua | 7 ++----- Data/Scripts/EditorGUI/EditorWindowManager.lua | 8 +++++++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'Data/Scripts') diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index 4c91f72..9e2b632 100644 --- a/Data/Scripts/EditorApplication.lua +++ b/Data/Scripts/EditorApplication.lua @@ -21,18 +21,15 @@ local mainWindow = GUI.ContainerWindow.New({400, 400, 800, 500}, GUI.EShowMode.M mainWindow:SetTitle("GameLab") mainWindow:SetIcon("./Data/Icon/GameLab.ico") -app:SetMainWindow(mainWindow:GetInternal()) +app:SetMainWindow(mainWindow:GetNative()) local guiWindow = GUI.GUIWindow.New() guiWindow:SetContainerWindow(mainWindow) guiWindow:SetPosition({0,0, 400, 400}) - local guiWindow2 = GUI.GUIWindow.New() guiWindow2:SetContainerWindow(mainWindow) -guiWindow2:SetPosition({500,0, 400, 400}) - -collectgarbage() +guiWindow2:SetPosition({400,0, 400, 400}) local wnd = AssetBrowser.New() diff --git a/Data/Scripts/EditorGUI/EditorWindowManager.lua b/Data/Scripts/EditorGUI/EditorWindowManager.lua index e3595ae..693cb9e 100644 --- a/Data/Scripts/EditorGUI/EditorWindowManager.lua +++ b/Data/Scripts/EditorGUI/EditorWindowManager.lua @@ -1,5 +1,11 @@ +local ContainerWindow = require("GameLab.Editor.GUI.ContainerWindow") +local GUIWindow = require("GameLab.Editor.GUI.GUIWindow") +local SplitWindow = require("GameLab.Editor.GUI.SplitWindow") + local EditorWindowManager = {} -EditorWindowManager.name = "asd" +EditorWindowManager.splitWindows = {} + + return EditorWindowManager \ No newline at end of file -- cgit v1.1-26-g67d0