From d24f17b88d901b779c81c7434995675eb2a17429 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 4 Nov 2021 12:55:25 +0800 Subject: - Internal:: --- Editor/GUI/EditorWindows.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Editor/GUI/EditorWindows.h') diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h index e1ad89a..78d9ca8 100644 --- a/Editor/GUI/EditorWindows.h +++ b/Editor/GUI/EditorWindows.h @@ -11,6 +11,7 @@ #include "Runtime/Graphics/OpenGL.h" #include "Runtime/Utilities/UtilMacros.h" #include "Editor/Utils/HelperFuncs.h" +#include "Runtime/Math/Math.h" using namespace LuaBind; @@ -29,7 +30,7 @@ public : class WindowManager : Singleton { public: - static Internal::Vector2 GetMousePosition(); + static Vector2 GetMousePosition(); static GUIWindow* GetMouseOverWindow(); private: @@ -56,7 +57,7 @@ public: ContainerWindow(LuaBind::VM* vm); ~ContainerWindow(); - void Init(Internal::Rect size, int showMode, const Internal::Vector2& minSize, const Internal::Vector2& maxSize, std::string name = ""); + void Init(Rect size, int showMode, const Vector2& minSize, const Vector2& maxSize, std::string name = ""); void SetTitle(const char* title); void SetIcon(LPCSTR iconName); void SetAsRenderContext(); @@ -83,7 +84,7 @@ private: bool m_IsClosing; bool m_InMenuLoop; bool m_CloseFromScriptDontShutdown; - Internal::Rect m_InternalRect; + Rect m_InternalRect; POINT m_MinSize; POINT m_MaxSize; @@ -138,7 +139,7 @@ public: void DoPaint(); void SetContainerWindow(ContainerWindow* wnd); void Focus(); - void SetPosition(Internal::Rect position); + void SetPosition(Rect position); void SetAsRenderContext(); void OnFocus(); -- cgit v1.1-26-g67d0