diff options
Diffstat (limited to 'Editor/GUI')
-rw-r--r-- | Editor/GUI/ContainerWindow.cpp | 4 | ||||
-rw-r--r-- | Editor/GUI/EditorWindows.h | 8 | ||||
-rw-r--r-- | Editor/GUI/GUIWindow.cpp | 4 | ||||
-rw-r--r-- | Editor/GUI/WindowManager.cpp | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/Editor/GUI/ContainerWindow.cpp b/Editor/GUI/ContainerWindow.cpp index 2aca239..5f3e6f8 100644 --- a/Editor/GUI/ContainerWindow.cpp +++ b/Editor/GUI/ContainerWindow.cpp @@ -274,7 +274,7 @@ bool ContainerWindow::SetRenderContext() } // 初始化,创建窗口 -void ContainerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name) +void ContainerWindow::Init(Rect pixelRect, int showMode, const Vector2& minSize, const Vector2& maxSize, std::string name) { // Aux windows are mac only. on windows they look just like normal utility windows. if (showMode == kShowAuxWindow) @@ -343,7 +343,7 @@ void ContainerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSiz // parentWindow = GetMainEditorWindow(); } - bool notSizeable = (minSize == maxSize) && (minSize != Vector2f::zero); + bool notSizeable = (minSize == maxSize) && (minSize != Vector2::zero); if (notSizeable) windowStyle &= ~(WS_THICKFRAME); diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h index 3b84b13..a7091dd 100644 --- a/Editor/GUI/EditorWindows.h +++ b/Editor/GUI/EditorWindows.h @@ -29,7 +29,7 @@ public : class WindowManager : Singleton<WindowManager> { public: - static Vector2f GetMousePosition(); + static Vector2 GetMousePosition(); static GUIWindow* GetMouseOverWindow(); private: @@ -56,7 +56,7 @@ public: ContainerWindow(LuaBind::VM* vm); ~ContainerWindow(); - void Init(Rectf size, int showMode, const Vector2f& minSize, const Vector2f& 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(); @@ -85,7 +85,7 @@ private: bool m_IsClosing; bool m_InMenuLoop; bool m_CloseFromScriptDontShutdown; - Rectf m_InternalRect; + Rect m_InternalRect; POINT m_MinSize; POINT m_MaxSize; @@ -140,7 +140,7 @@ public: void DoPaint(); void SetContainerWindow(ContainerWindow* wnd); void Focus(); - void SetPosition(Rectf position); + void SetPosition(Rect position); void SetAsRenderContext(); void OnFocus(); diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp index fb23a59..df28785 100644 --- a/Editor/GUI/GUIWindow.cpp +++ b/Editor/GUI/GUIWindow.cpp @@ -196,7 +196,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; - Rectf pixelRect; + Rect pixelRect; pixelRect.x = 0; pixelRect.y = 0; pixelRect.width = 32; @@ -326,7 +326,7 @@ void GUIWindow::OnPaint() InvokeLuaCallback(m_Script, "OnPaint"); } -void GUIWindow::SetPosition(Rectf position) +void GUIWindow::SetPosition(Rect position) { log_info("GUIWindow::SetPosition()"); RECT rc; diff --git a/Editor/GUI/WindowManager.cpp b/Editor/GUI/WindowManager.cpp index 533435f..d8a4135 100644 --- a/Editor/GUI/WindowManager.cpp +++ b/Editor/GUI/WindowManager.cpp @@ -8,12 +8,12 @@ GUIWindow* WindowManager::GetMouseOverWindow() return NULL; } -Vector2f WindowManager::GetMousePosition() +Vector2 WindowManager::GetMousePosition() { POINT pt; if (!GetCursorPos(&pt)) - return Vector2f(0, 0); + return Vector2(0, 0); - return Vector2f(pt.x, pt.y); + return Vector2(pt.x, pt.y); } |