diff --git a/Source/Engine/Engine/Linux/LinuxGame.cpp b/Source/Engine/Engine/Linux/LinuxGame.cpp index 293fc6092..a3055def9 100644 --- a/Source/Engine/Engine/Linux/LinuxGame.cpp +++ b/Source/Engine/Engine/Linux/LinuxGame.cpp @@ -16,8 +16,6 @@ void LinuxGame::InitMainWindowSettings(CreateWindowSettings& settings) { - // TODO: restore window size and fullscreen mode from the cached local settings saved after previous session - const auto platformSettings = LinuxPlatformSettings::Get(); auto windowMode = platformSettings->WindowMode; @@ -50,7 +48,6 @@ void LinuxGame::InitMainWindowSettings(CreateWindowSettings& settings) settings.HasBorder = windowMode == GameWindowMode::Windowed || windowMode == GameWindowMode::Fullscreen; settings.AllowMaximize = true; settings.AllowMinimize = platformSettings->ResizableWindow; - } bool LinuxGame::Init() diff --git a/Source/Engine/Engine/Mac/MacGame.cpp b/Source/Engine/Engine/Mac/MacGame.cpp index 640816906..aac68d070 100644 --- a/Source/Engine/Engine/Mac/MacGame.cpp +++ b/Source/Engine/Engine/Mac/MacGame.cpp @@ -9,8 +9,6 @@ void MacGame::InitMainWindowSettings(CreateWindowSettings& settings) { - // TODO: restore window size and fullscreen mode from the cached local settings saved after previous session - const auto platformSettings = MacPlatformSettings::Get(); auto windowMode = platformSettings->WindowMode; @@ -41,7 +39,6 @@ void MacGame::InitMainWindowSettings(CreateWindowSettings& settings) settings.HasBorder = windowMode == GameWindowMode::Windowed || windowMode == GameWindowMode::Fullscreen; settings.AllowMaximize = true; settings.AllowMinimize = platformSettings->ResizableWindow; - } #endif diff --git a/Source/Engine/Engine/Windows/WindowsGame.cpp b/Source/Engine/Engine/Windows/WindowsGame.cpp index c15a543a4..e0135b9ec 100644 --- a/Source/Engine/Engine/Windows/WindowsGame.cpp +++ b/Source/Engine/Engine/Windows/WindowsGame.cpp @@ -9,8 +9,6 @@ void WindowsGame::InitMainWindowSettings(CreateWindowSettings& settings) { - // TODO: restore window size and fullscreen mode from the cached local settings saved after previous session - const auto platformSettings = WindowsPlatformSettings::Get(); auto windowMode = platformSettings->WindowMode; diff --git a/Source/Engine/Platform/Mac/MacWindow.cpp b/Source/Engine/Platform/Mac/MacWindow.cpp index ebccb5709..b1dc0768f 100644 --- a/Source/Engine/Platform/Mac/MacWindow.cpp +++ b/Source/Engine/Platform/Mac/MacWindow.cpp @@ -715,6 +715,11 @@ MacWindow::MacWindow(const CreateWindowSettings& settings) styleMask |= NSWindowStyleMaskTitled; styleMask &= ~NSWindowStyleMaskFullSizeContentView; } + else + { + styleMask |= NSWindowStyleMaskBorderless; + styleMask &= ~NSWindowStyleMaskTitled; + } const float screenScale = MacPlatform::ScreenScale; frame.origin.x /= screenScale;