mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-24 04:43:49 +00:00
Code Issues Projects Releases Wiki Activity

rename to windowed fullscreen

Browse Source
This commit is contained in:
cody glassman 2022-05-08 22:56:35 -07:00
parent 05901a2480
commit ad139f2f9a
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

2
apps/launcher/graphicspage.cpp
View File

@ -359,7 +359,7 @@ void Launcher::GraphicsPage::screenChanged(int screen)
void Launcher::GraphicsPage::slotFullScreenChanged(int mode)
{
if (mode == static_cast<int>(Settings::WindowMode::Fullscreen) || mode == static_cast<int>(Settings::WindowMode::BorderlessFullscreen)) {
if (mode == static_cast<int>(Settings::WindowMode::Fullscreen) || mode == static_cast<int>(Settings::WindowMode::WindowedFullscreen)) {
standardRadioButton->toggle();
customRadioButton->setEnabled(false);
customWidthSpinBox->setEnabled(false);

4
apps/openmw/engine.cpp
View File

@ -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

2
apps/openmw/mwgui/settingswindow.cpp
View File

@ -328,7 +328,7 @@ namespace MWGui
updateMaxLightsComboBox(mMaxLights);
Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(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);

2
components/sdlutil/sdlvideowrapper.cpp
View File

@ -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);

2
components/settings/settings.hpp
View File

@ -19,7 +19,7 @@ namespace Settings
enum class WindowMode
{
Fullscreen = 0,
BorderlessFullscreen,
WindowedFullscreen,
Windowed
};

5
docs/source/reference/modding/settings/video.rst
View File

@ -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.

2
files/mygui/openmw_settings_window.layout
View File

@ -276,7 +276,7 @@
<Widget type="HBox" skin="" position="182 28 300 24">
<Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WindowModeList">
<Property key="AddItem" value="Fullscreen"/>
<Property key="AddItem" value="Borderless Fullscreen"/>
<Property key="AddItem" value="Windowed Fullscreen"/>
<Property key="AddItem" value="Windowed"/>
</Widget>
</Widget>

2
files/settings-default.cfg
View File

@ -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).

2
files/ui/graphicspage.ui
View File

@ -131,7 +131,7 @@
</item>
<item>
<property name="text">
<string>Borderless Fullscreen</string>
<string>Windowed Fullscreen</string>
</property>
</item>
<item>