diff options
Diffstat (limited to 'Editor/GUI/ContainerWindow.cpp')
| -rw-r--r-- | Editor/GUI/ContainerWindow.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Editor/GUI/ContainerWindow.cpp b/Editor/GUI/ContainerWindow.cpp index f7d9e45..57b1b48 100644 --- a/Editor/GUI/ContainerWindow.cpp +++ b/Editor/GUI/ContainerWindow.cpp @@ -14,10 +14,13 @@ static bool s_IsMainWindowMaximized; extern bool ProcessMainWindowMessages(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT& result); -static PAINTSTRUCT ps; LRESULT CALLBACK ContainerWindow::ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - +#if GAMELAB_DEBUG + static int _event_count = 0; + log_info_tag("WndProc", "ContrainerWindow Event %d", ++_event_count); +#endif + ContainerWindow *self = (ContainerWindow*)GetWindowLongPtr(hWnd, GWLP_USERDATA); if (!self) { @@ -25,8 +28,6 @@ LRESULT CALLBACK ContainerWindow::ContainerWndProc(HWND hWnd, UINT message, WPAR return DefWindowProcW(hWnd, message, wParam, lParam); } - //log_info_tag("WndProc", "ContainerWindow::ContainerWndProc(), ContainerWindow name is " + self->GetName()); - switch (message) { case WM_MENUSELECT: @@ -43,6 +44,7 @@ LRESULT CALLBACK ContainerWindow::ContainerWndProc(HWND hWnd, UINT message, WPAR return WM_SETICON; case WM_PAINT: { + static PAINTSTRUCT ps; log_info("WM_PAINT"); self->SetAsRenderContext(); glEnable(GL_BLEND); @@ -343,9 +345,9 @@ void ContainerWindow::Init(Rect pixelRect, int showMode, const Vector2& minSize, // parentWindow = GetMainEditorWindow(); } - bool notSizeable = (minSize == maxSize) && (minSize != Vector2::zero); - if (notSizeable) - windowStyle &= ~(WS_THICKFRAME); + //bool notSizeable = (minSize == maxSize) && (minSize != Vector2::zero); + //if (notSizeable) + // windowStyle &= ~(WS_THICKFRAME); AdjustWindowRectEx(&rect, windowStyle, showMode == kShowMainWindow, extendedStyle); int extraX = rect.right - rect.left - 200; @@ -379,8 +381,8 @@ void ContainerWindow::Init(Rect pixelRect, int showMode, const Vector2& minSize, if (pixelRect.width > 10 || pixelRect.height > 10) { //SetRect(pixelRect); - if (shouldMaximize) - SetWindowLong(m_Window, GWL_STYLE, windowStyle | WS_MAXIMIZE); + //if (shouldMaximize) + // SetWindowLong(m_Window, GWL_STYLE, windowStyle | WS_MAXIMIZE); } if (showMode == kShowMainWindow) |