diff options
Diffstat (limited to 'Editor')
| -rw-r--r-- | Editor/GUI/ContainerWindow.cpp | 2 | ||||
| -rw-r--r-- | Editor/GUI/EditorWindows.h | 6 | ||||
| -rw-r--r-- | Editor/GUI/GUIWindow.cpp | 4 | ||||
| -rw-r--r-- | Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp | 2 | ||||
| -rw-r--r-- | Editor/Scripting/EditorGUI/GUIWindow.bind.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Editor/GUI/ContainerWindow.cpp b/Editor/GUI/ContainerWindow.cpp index 96e5a1b..62c6cb7 100644 --- a/Editor/GUI/ContainerWindow.cpp +++ b/Editor/GUI/ContainerWindow.cpp @@ -274,7 +274,7 @@ bool ContainerWindow::SetRenderContext() } // 初始化，创建窗口 -void ContainerWindow::Init(Rect pixelRect, int showMode, const Internal::Vector2& minSize, const Internal::Vector2& maxSize, std::string name) +void ContainerWindow::Init(Internal::Rect pixelRect, int showMode, const Internal::Vector2& minSize, const Internal::Vector2& maxSize, std::string name) { // Aux windows are mac only. on windows they look just like normal utility windows. if (showMode == kShowAuxWindow) diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h index 9628af8..79e047c 100644 --- a/Editor/GUI/EditorWindows.h +++ b/Editor/GUI/EditorWindows.h @@ -56,7 +56,7 @@ public: ContainerWindow(LuaBind::VM* vm); ~ContainerWindow(); - void Init(Rect size, int showMode, const Internal::Vector2& minSize, const Internal::Vector2& maxSize, std::string name = ""); + void Init(Internal::Rect size, int showMode, const Internal::Vector2& minSize, const Internal::Vector2& maxSize, std::string name = ""); void SetTitle(const char* title); void SetIcon(LPCSTR iconName); void SetAsRenderContext(); @@ -85,7 +85,7 @@ private: bool m_IsClosing; bool m_InMenuLoop; bool m_CloseFromScriptDontShutdown; - Rect m_InternalRect; + Internal::Rect m_InternalRect; POINT m_MinSize; POINT m_MaxSize; @@ -140,7 +140,7 @@ public: void DoPaint(); void SetContainerWindow(ContainerWindow* wnd); void Focus(); - void SetPosition(Rect position); + void SetPosition(Internal::Rect position); void SetAsRenderContext(); void OnFocus(); diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp index 621eb54..13249ac 100644 --- a/Editor/GUI/GUIWindow.cpp +++ b/Editor/GUI/GUIWindow.cpp @@ -200,7 +200,7 @@ void GUIWindow::Init(std::string name) //DWORD windowStyle = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_CLIPCHILDREN | WS_MAXIMIZEBOX | WS_MINIMIZEBOX; DWORD extendedStyle = WS_EX_TOOLWINDOW; - Rect pixelRect; + Internal::Rect pixelRect; pixelRect.x = 0; pixelRect.y = 0; pixelRect.width = 32; @@ -330,7 +330,7 @@ void GUIWindow::OnPaint() InvokeLuaCallback(m_Script, "OnGUI"); } -void GUIWindow::SetPosition(Rect position) +void GUIWindow::SetPosition(Internal::Rect position) { log_info("GUIWindow::SetPosition()"); RECT rc; diff --git a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp index 531128b..5906788 100644 --- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp +++ b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp @@ -56,7 +56,7 @@ LUA_BIND_IMPL_METHOD(ContainerWindow, ContainerWindow::_New) ContainerWindow* wnd = new ContainerWindow(state.GetVM()); - Rect rect = state.GetValue<Rect>(state, Rect()); + Internal::Rect rect = state.GetValue<Internal::Rect>(state, Internal::Rect()); int showMode = state.GetValue<int>(2, 0); Internal::Vector2 min = state.GetValue<Internal::Vector2>(state, Internal::Vector2()); Internal::Vector2 max = state.GetValue<Internal::Vector2>(state, Internal::Vector2()); diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp index e991398..7e31da5 100644 --- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp +++ b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp @@ -62,7 +62,7 @@ LUA_BIND_IMPL_METHOD(GUIWindow, _SetPosition) if (!state.CheckParams(1, "UT")) return 0; - Rect rect; + Internal::Rect rect; rect.x = state.GetField<float>(2, 1, 0); rect.y = state.GetField<float>(2, 2, 0); rect.width = state.GetField<float>(2, 3, 0); |