summaryrefslogtreecommitdiff
path: root/Editor/GUI
diff options
context:
space:
mode:
Diffstat (limited to 'Editor/GUI')
-rw-r--r--Editor/GUI/ContainerWindow.cpp (renamed from Editor/GUI/ContainnerWindow.cpp)30
-rw-r--r--Editor/GUI/EditorWindows.h16
-rw-r--r--Editor/GUI/GUIWindow.cpp16
-rw-r--r--Editor/GUI/MenuManager.cpp2
-rw-r--r--Editor/GUI/WindowUtil.cpp4
5 files changed, 34 insertions, 34 deletions
diff --git a/Editor/GUI/ContainnerWindow.cpp b/Editor/GUI/ContainerWindow.cpp
index d6a67c9..ee42635 100644
--- a/Editor/GUI/ContainnerWindow.cpp
+++ b/Editor/GUI/ContainerWindow.cpp
@@ -14,17 +14,17 @@ static bool s_IsMainWindowMaximized;
extern bool ProcessMainWindowMessages(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT& result);
static PAINTSTRUCT ps;
-LRESULT CALLBACK ContainnerWindow::ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK ContainerWindow::ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- ContainnerWindow *self = (ContainnerWindow*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+ ContainerWindow *self = (ContainerWindow*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
if (!self)
{
- log_warning("Nullptr ContainnerWindow");
+ log_warning("Nullptr ContainerWindow");
return DefWindowProcW(hWnd, message, wParam, lParam);
}
- //log_info("WndProc", "ContainnerWindow::ContainerWndProc(), ContainnerWindow name is " + self->GetName());
+ //log_info("WndProc", "ContainerWindow::ContainerWndProc(), ContainerWindow name is " + self->GetName());
switch (message)
{
@@ -177,22 +177,22 @@ LRESULT CALLBACK ContainnerWindow::ContainerWndProc(HWND hWnd, UINT message, WPA
return flag;
}
-ContainnerWindow::ContainnerWindow()
+ContainerWindow::ContainerWindow()
{
}
-ContainnerWindow::~ContainnerWindow()
+ContainerWindow::~ContainerWindow()
{
}
-void ContainnerWindow::DoPaint()
+void ContainerWindow::DoPaint()
{
SetWindowLongPtr(m_Window, GWLP_USERDATA, (LONG_PTR)this);
SendMessage(m_Window, WM_PAINT, 0, 0);
}
-void ContainnerWindow::SetAsRenderContext()
+void ContainerWindow::SetAsRenderContext()
{
Assert(m_DC != NULL);
Assert(m_RC != NULL);
@@ -202,7 +202,7 @@ void ContainnerWindow::SetAsRenderContext()
glViewport(0, 0, rect.right - rect.left, rect.bottom - rect.top);
}
-bool ContainnerWindow::SetRenderContext()
+bool ContainerWindow::SetRenderContext()
{
m_DC = ::GetDC(m_Window);
if (!m_DC)
@@ -273,7 +273,7 @@ bool ContainnerWindow::SetRenderContext()
}
// 初始化，创建窗口
-void ContainnerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name)
+void ContainerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name)
{
// Aux windows are mac only. on windows they look just like normal utility windows.
if (showMode == kShowAuxWindow)
@@ -401,12 +401,12 @@ void ContainnerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSi
}
-void ContainnerWindow::SetTitle(const char* title)
+void ContainerWindow::SetTitle(const char* title)
{
SetWindowTextA(m_Window, title);
}
-void ContainnerWindow::SetIcon(LPCSTR iconName)
+void ContainerWindow::SetIcon(LPCSTR iconName)
{
Assert(m_ShowMode == ShowMode::kShowMainWindow);
@@ -419,19 +419,19 @@ void ContainnerWindow::SetIcon(LPCSTR iconName)
log_error("icon error: " + to_string(GetLastError()));
}
-void ContainnerWindow::Close()
+void ContainerWindow::Close()
{
log_info("Close window " + m_Name);
SendMessage(m_Window, WM_CLOSE, 0, 0);
}
-void ContainnerWindow::OnRectChanged()
+void ContainerWindow::OnRectChanged()
{
}
-void ContainnerWindow::OnActivateApplication(bool active)
+void ContainerWindow::OnActivateApplication(bool active)
{
}
diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h
index 97175b3..ba71c06 100644
--- a/Editor/GUI/EditorWindows.h
+++ b/Editor/GUI/EditorWindows.h
@@ -38,8 +38,8 @@ private:
};
// 一个containner window中有多个viewport
-class ContainnerWindow
- : public LuaBind::NativeClass<ContainnerWindow>
+class ContainerWindow
+ : public LuaBind::NativeClass<ContainerWindow>
{
public:
static LRESULT CALLBACK ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
@@ -53,8 +53,8 @@ public:
kShowAuxWindow = 5, // Popup windows like the color picker, gradient editor, etc. Drawn with black background on Mac
};
- ContainnerWindow();
- ~ContainnerWindow();
+ ContainerWindow();
+ ~ContainerWindow();
void Init(Rectf size, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name = "");
void SetTitle(const char* title);
@@ -89,7 +89,7 @@ private:
POINT m_MinSize;
POINT m_MaxSize;
- LUA_BIND_DECL_FACTORY(ContainnerWindow);
+ LUA_BIND_DECL_FACTORY(ContainerWindow);
LUA_BIND_DECL_METHOD(_New);
LUA_BIND_DECL_METHOD(_SetTitle);
@@ -136,7 +136,7 @@ public:
void Init(std::string name = "");
void DoPaint();
- void SetContainnerWindow(ContainnerWindow* wnd);
+ void SetContainerWindow(ContainerWindow* wnd);
void Focus();
void SetPosition(Rectf position);
void SetAsRenderContext();
@@ -154,7 +154,7 @@ private:
std::string m_Name;
- ContainnerWindow* m_ContainnerWindow;
+ ContainerWindow* m_ContainerWindow;
HWND m_Handle;
HDC m_DC;
HGLRC m_RC;
@@ -166,7 +166,7 @@ private:
LUA_BIND_DECL_METHOD(_New);
LUA_BIND_DECL_METHOD(_DoPaint);
LUA_BIND_DECL_METHOD(_Focus);
- LUA_BIND_DECL_METHOD(_SetContainnerWindow);
+ LUA_BIND_DECL_METHOD(_SetContainerWindow);
LUA_BIND_DECL_METHOD(_SetPosition);
};
diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp
index 34d7705..107a298 100644
--- a/Editor/GUI/GUIWindow.cpp
+++ b/Editor/GUI/GUIWindow.cpp
@@ -294,10 +294,10 @@ bool GUIWindow::SetRenderContext()
if (m_RC && !g_IsGLInitialized)
{
log_info("Initialize OpenGL");
- wglMakeCurrent(m_DC, m_RC);
- if (!gladLoadGL()) {
- log_error("初始化GL错误");
- }
+ wglMakeCurrent(m_DC, m_RC);
+ if (!gladLoadGL()) {
+ log_error("初始化GL错误");
+ }
g_IsGLInitialized = true;
}
return true;
@@ -343,17 +343,17 @@ void GUIWindow::Focus()
log_info("Focus GUIWindow " + (long)this);
if (m_Handle)
{
- if (::GetForegroundWindow() != m_ContainnerWindow->GetWindowHandle())
- ::SetForegroundWindow(m_ContainnerWindow->GetWindowHandle());
+ if (::GetForegroundWindow() != m_ContainerWindow->GetWindowHandle())
+ ::SetForegroundWindow(m_ContainerWindow->GetWindowHandle());
SetFocus(m_Handle);
}
}
-void GUIWindow::SetContainnerWindow(ContainnerWindow* wnd)
+void GUIWindow::SetContainerWindow(ContainerWindow* wnd)
{
Assert(wnd != NULL);
- m_ContainnerWindow = wnd;
+ m_ContainerWindow = wnd;
if (wnd->GetWindowHandle() != m_Handle)
{
diff --git a/Editor/GUI/MenuManager.cpp b/Editor/GUI/MenuManager.cpp
index 53dfd5a..c0fc989 100644
--- a/Editor/GUI/MenuManager.cpp
+++ b/Editor/GUI/MenuManager.cpp
@@ -18,7 +18,7 @@ MenuManager::MenuManager()
void MenuManager::Init()
{
- ContainnerWindow* mainWnd = EditorManager::Instance()->GetMainWindow();
+ ContainerWindow* mainWnd = EditorManager::Instance()->GetMainWindow();
Assert(mainWnd != NULL);
HMENU hMenubar = CreateMenu();
diff --git a/Editor/GUI/WindowUtil.cpp b/Editor/GUI/WindowUtil.cpp
index b76b6d0..34a7b30 100644
--- a/Editor/GUI/WindowUtil.cpp
+++ b/Editor/GUI/WindowUtil.cpp
@@ -13,7 +13,7 @@ void WindowUtil::RegisterClasses()
{
log_info("WindowUtil::Init()");
- ContainerWindowClassAtom = winutils::RegisterWindowClass(kContainerWindowClassName, ContainnerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW);
- PopupWindowClassAtom = winutils::RegisterWindowClass(kPopupWindowClassName, ContainnerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW | CS_DROPSHADOW);//CS_HREDRAW宽度（水平）变化时重绘、CS_VREDRAW高度（垂直）变化时重绘
+ ContainerWindowClassAtom = winutils::RegisterWindowClass(kContainerWindowClassName, ContainerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW);
+ PopupWindowClassAtom = winutils::RegisterWindowClass(kPopupWindowClassName, ContainerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW | CS_DROPSHADOW);//CS_HREDRAW宽度（水平）变化时重绘、CS_VREDRAW高度（垂直）变化时重绘
GUIViewClassAtom = winutils::RegisterWindowClass(kGUIWindowClassName, GUIWindow::GUIViewWndProc, CS_HREDRAW | CS_VREDRAW | CS_DROPSHADOW);
} \ No newline at end of file
generated by cgit v1.1-26-g67d0 at 2025-05-21 14:07:21 +0000