diff --git a/CHANGELOG.md b/CHANGELOG.md index c7396ba328..66f5868589 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -157,7 +157,7 @@ Feature #6600: Support NiSortAdjustNode Feature #6684: Support NiFltAnimationNode Feature #6699: Ignored flag - Feature #6700: Support borderless fullscreen + Feature #6700: Support windowed fullscreen Feature #6706: Save the size of the Options window Feature #6721: [OpenMW-CS] Add option to open records in new window Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index d3e5d1c86d..5a57be0e53 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -359,7 +359,7 @@ void Launcher::GraphicsPage::screenChanged(int screen) void Launcher::GraphicsPage::slotFullScreenChanged(int mode) { - if (mode == static_cast(Settings::WindowMode::Fullscreen) || mode == static_cast(Settings::WindowMode::BorderlessFullscreen)) { + if (mode == static_cast(Settings::WindowMode::Fullscreen) || mode == static_cast(Settings::WindowMode::WindowedFullscreen)) { standardRadioButton->toggle(); customRadioButton->setEnabled(false); customWidthSpinBox->setEnabled(false); diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 2e12fecd39..fa84bcf14c 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -562,7 +562,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings) int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen), pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen); - if(windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::BorderlessFullscreen) + if(windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen) { pos_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen); pos_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen); @@ -571,7 +571,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings) Uint32 flags = SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE; if(windowMode == Settings::WindowMode::Fullscreen) flags |= SDL_WINDOW_FULLSCREEN; - else if (windowMode == Settings::WindowMode::BorderlessFullscreen) + else if (windowMode == Settings::WindowMode::WindowedFullscreen) flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; // Allows for Windows snapping features to properly work in borderless window diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index 95a555da99..785cec9ef6 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/apps/openmw/mwgui/settingswindow.cpp @@ -328,7 +328,7 @@ namespace MWGui updateMaxLightsComboBox(mMaxLights); Settings::WindowMode windowMode = static_cast(Settings::Manager::getInt("window mode", "Video")); - mWindowBorderButton->setEnabled(windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::BorderlessFullscreen); + mWindowBorderButton->setEnabled(windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen); mKeyboardSwitch->setStateSelected(true); mControllerSwitch->setStateSelected(false); diff --git a/components/sdlutil/sdlvideowrapper.cpp b/components/sdlutil/sdlvideowrapper.cpp index dec0942259..7d62979e7f 100644 --- a/components/sdlutil/sdlvideowrapper.cpp +++ b/components/sdlutil/sdlvideowrapper.cpp @@ -76,7 +76,7 @@ namespace SDLUtil if (SDL_GetWindowFlags(mWindow) & SDL_WINDOW_MAXIMIZED) SDL_RestoreWindow(mWindow); - if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::BorderlessFullscreen) + if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen) { SDL_DisplayMode mode; SDL_GetWindowDisplayMode(mWindow, &mode); diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp index 89adfea7e0..693941df10 100644 --- a/components/settings/settings.hpp +++ b/components/settings/settings.hpp @@ -19,7 +19,7 @@ namespace Settings enum class WindowMode { Fullscreen = 0, - BorderlessFullscreen, + WindowedFullscreen, Windowed }; diff --git a/docs/source/reference/modding/settings/video.rst b/docs/source/reference/modding/settings/video.rst index f57b4e92d5..b05fbf0380 100644 --- a/docs/source/reference/modding/settings/video.rst +++ b/docs/source/reference/modding/settings/video.rst @@ -40,12 +40,13 @@ window mode This setting determines the window mode. -0: Fullscreen +0: Exclusive fullscreen -1: Borderless Fullscreen +1: Windowed fullscreen, borderless window that matches screen resolution 2: Windowed + This setting can be toggled in game using the dropdown list in the Video tab of the Video panel in the Options menu. It can also be toggled with the window mode dropdown in the Graphics tab of the OpenMW Launcher. diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout index b5c3185693..a134d8ecb8 100644 --- a/files/mygui/openmw_settings_window.layout +++ b/files/mygui/openmw_settings_window.layout @@ -276,7 +276,7 @@ - + diff --git a/files/settings-default.cfg b/files/settings-default.cfg index bc3c104765..3a41f72d9b 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -612,7 +612,7 @@ resolution x = 800 resolution y = 600 # Specify the window mode. -# 0 = Fullscreen, 1 = Borderless Fullscreen, 2 = Windowed +# 0 = Fullscreen, 1 = Windowed Fullscreen, 2 = Windowed window mode = 0 # Determines which screen OpenMW is on. (>=0). diff --git a/files/ui/graphicspage.ui b/files/ui/graphicspage.ui index 6a186906a5..8cf26aa1e2 100644 --- a/files/ui/graphicspage.ui +++ b/files/ui/graphicspage.ui @@ -131,7 +131,7 @@ - Borderless Fullscreen + Windowed Fullscreen