GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Minor improvements to #1315 and add getter of current window style

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-21 23:33:33 +02:00
parent d432654a57
commit 50c85aec6d
6 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Platform/Windows/WindowsWindow.cpp
View File

@@ -260,7 +260,7 @@ void WindowsWindow::Maximize()
_isDuringMaximize = false;
}
void WindowsWindow::SetBorderless(bool isBorderless, bool fullscreen)
void WindowsWindow::SetBorderless(bool isBorderless, bool maximized)
{
ASSERT(HasHWND());
@@ -292,8 +292,7 @@ void WindowsWindow::SetBorderless(bool isBorderless, bool fullscreen)
SetWindowLong(_handle, GWL_STYLE, lStyle);
SetWindowPos(_handle, HWND_TOP, 0, 0,0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
if (fullscreen)
if (maximized)
{
ShowWindow(_handle, SW_SHOWMAXIMIZED);
}
@@ -312,13 +311,12 @@ void WindowsWindow::SetBorderless(bool isBorderless, bool fullscreen)
lStyle |= WS_MINIMIZEBOX;
if (_settings.HasSizingFrame)
lStyle |= WS_THICKFRAME;
// Create window style flags
lStyle |= WS_OVERLAPPED | WS_SYSMENU | WS_BORDER | WS_CAPTION;
SetWindowLong(_handle, GWL_STYLE, lStyle);
SetWindowPos(_handle, nullptr, 0, 0, (int)_settings.Size.X, (int)_settings.Size.Y, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
if (fullscreen)
if (maximized)
{
Maximize();
}
@@ -327,6 +325,7 @@ void WindowsWindow::SetBorderless(bool isBorderless, bool fullscreen)
ShowWindow(_handle, SW_SHOW);
}
}
CheckForWindowResize();
}