From 1986f2b58b0ddad7b6783742a728b63e5ae91a68 Mon Sep 17 00:00:00 2001 From: MineBill Date: Wed, 11 Oct 2023 17:06:16 +0300 Subject: [PATCH 1/2] Only set WS_CAPTION if the window is a regular window --- Source/Engine/Platform/Windows/WindowsWindow.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Engine/Platform/Windows/WindowsWindow.cpp b/Source/Engine/Platform/Windows/WindowsWindow.cpp index 1bc50f207..8d6cbdf18 100644 --- a/Source/Engine/Platform/Windows/WindowsWindow.cpp +++ b/Source/Engine/Platform/Windows/WindowsWindow.cpp @@ -108,8 +108,7 @@ WindowsWindow::WindowsWindow(const CreateWindowSettings& settings) style |= WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP; #elif WINDOWS_USE_NEWER_BORDER_LESS if (settings.IsRegularWindow) - style |= WS_THICKFRAME | WS_SYSMENU; - style |= WS_CAPTION; + style |= WS_THICKFRAME | WS_SYSMENU | WS_CAPTION; #endif exStyle |= WS_EX_WINDOWEDGE; } From dad3e1f77da66bfad200cf5897a256ee2fa6b1de Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 11 Oct 2023 17:17:46 +0200 Subject: [PATCH 2/2] Revert f1d57e47cb7e86596cf9cdb376d7002d8d0cfe6c in favor of #1670 --- Source/Engine/Platform/Windows/WindowsWindow.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/Engine/Platform/Windows/WindowsWindow.cpp b/Source/Engine/Platform/Windows/WindowsWindow.cpp index 8d6cbdf18..fb9fbe09d 100644 --- a/Source/Engine/Platform/Windows/WindowsWindow.cpp +++ b/Source/Engine/Platform/Windows/WindowsWindow.cpp @@ -219,12 +219,6 @@ void WindowsWindow::Show() if (!_settings.HasBorder) { SetWindowPos(_handle, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); - if (!_settings.IsRegularWindow && _settings.ShowAfterFirstPaint && _settings.StartPosition == WindowStartPosition::Manual) - { - int32 x = Math::TruncToInt(_settings.Position.X); - int32 y = Math::TruncToInt(_settings.Position.Y); - SetWindowPos(_handle, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER); - } } #endif