evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve windowing logic

Browse Source
This commit is contained in:
Kae 2023-06-29 01:12:52 +10:00
parent 9486a56508
commit bc2080e2c6
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/application/StarMainApplication_sdl.cpp
View File

@ -445,8 +445,12 @@ private:
if (SDL_SetWindowDisplayMode(parent->m_sdlWindow, &requestedDisplayMode) == 0) { if (SDL_SetWindowDisplayMode(parent->m_sdlWindow, &requestedDisplayMode) == 0) {
if (parent->m_windowMode == WindowMode::Fullscreen) if (parent->m_windowMode == WindowMode::Fullscreen)
SDL_SetWindowFullscreen(parent->m_sdlWindow, 0); SDL_SetWindowFullscreen(parent->m_sdlWindow, 0);
else else if (parent->m_windowMode == WindowMode::Borderless)
parent->m_windowMode = WindowMode::Fullscreen; SDL_SetWindowBordered(parent->m_sdlWindow, SDL_TRUE);
else if (parent->m_windowMode == WindowMode::Maximized)
SDL_RestoreWindow(parent->m_sdlWindow);
parent->m_windowMode = WindowMode::Fullscreen;
SDL_SetWindowFullscreen(parent->m_sdlWindow, SDL_WINDOW_FULLSCREEN); SDL_SetWindowFullscreen(parent->m_sdlWindow, SDL_WINDOW_FULLSCREEN);
} else { } else {
Logger::warn("Failed to set resolution {}, {}", (unsigned)requestedDisplayMode.w, (unsigned)requestedDisplayMode.h); Logger::warn("Failed to set resolution {}, {}", (unsigned)requestedDisplayMode.w, (unsigned)requestedDisplayMode.h);
@ -469,16 +473,18 @@ private:
} }
void setNormalWindow(Vec2U windowSize) override { void setNormalWindow(Vec2U windowSize) override {
auto window = parent->m_sdlWindow;
if (parent->m_windowMode != WindowMode::Normal || parent->m_windowSize != windowSize) { if (parent->m_windowMode != WindowMode::Normal || parent->m_windowSize != windowSize) {
if (parent->m_windowMode == WindowMode::Fullscreen || parent->m_windowMode == WindowMode::Borderless) { if (parent->m_windowMode == WindowMode::Fullscreen)
SDL_SetWindowFullscreen(parent->m_sdlWindow, 0); SDL_SetWindowFullscreen(window, 0);
SDL_SetWindowBordered(parent->m_sdlWindow, SDL_TRUE); else if (parent->m_windowMode == WindowMode::Borderless)
} SDL_SetWindowBordered(window, SDL_TRUE);
else if (parent->m_windowMode == WindowMode::Maximized) else if (parent->m_windowMode == WindowMode::Maximized)
SDL_RestoreWindow(parent->m_sdlWindow); SDL_RestoreWindow(window);
SDL_SetWindowSize(parent->m_sdlWindow, windowSize[0], windowSize[1]); SDL_SetWindowBordered(window, SDL_TRUE);
SDL_SetWindowPosition(parent->m_sdlWindow, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); SDL_SetWindowSize(window, windowSize[0], windowSize[1]);
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
parent->m_windowMode = WindowMode::Normal; parent->m_windowMode = WindowMode::Normal;
parent->m_windowSize = windowSize; parent->m_windowSize = windowSize;
@ -487,11 +493,12 @@ private:
void setMaximizedWindow() override { void setMaximizedWindow() override {
if (parent->m_windowMode != WindowMode::Maximized) { if (parent->m_windowMode != WindowMode::Maximized) {
if (parent->m_windowMode == WindowMode::Fullscreen || parent->m_windowMode == WindowMode::Borderless) { if (parent->m_windowMode == WindowMode::Fullscreen)
SDL_SetWindowFullscreen(parent->m_sdlWindow, 0); SDL_SetWindowFullscreen(parent->m_sdlWindow, 0);
else if (parent->m_windowMode == WindowMode::Borderless)
SDL_SetWindowBordered(parent->m_sdlWindow, SDL_TRUE); SDL_SetWindowBordered(parent->m_sdlWindow, SDL_TRUE);
}
SDL_RestoreWindow(parent->m_sdlWindow);
SDL_MaximizeWindow(parent->m_sdlWindow); SDL_MaximizeWindow(parent->m_sdlWindow);
parent->m_windowMode = WindowMode::Maximized; parent->m_windowMode = WindowMode::Maximized;
} }
@ -499,19 +506,24 @@ private:
void setBorderlessWindow() override { void setBorderlessWindow() override {
if (parent->m_windowMode != WindowMode::Borderless) { if (parent->m_windowMode != WindowMode::Borderless) {
SDL_SetWindowFullscreen(parent->m_sdlWindow, 0); if (parent->m_windowMode == WindowMode::Fullscreen)
SDL_SetWindowFullscreen(parent->m_sdlWindow, 0);
else if (parent->m_windowMode == WindowMode::Maximized)
SDL_RestoreWindow(parent->m_sdlWindow);
SDL_SetWindowBordered(parent->m_sdlWindow, SDL_FALSE); SDL_SetWindowBordered(parent->m_sdlWindow, SDL_FALSE);
SDL_MaximizeWindow(parent->m_sdlWindow);
parent->m_windowMode = WindowMode::Borderless; parent->m_windowMode = WindowMode::Borderless;
SDL_DisplayMode actualDisplayMode; SDL_DisplayMode actualDisplayMode;
if (SDL_GetWindowDisplayMode(parent->m_sdlWindow, &actualDisplayMode) == 0) { if (SDL_GetDesktopDisplayMode(SDL_GetWindowDisplayIndex(parent->m_sdlWindow), &actualDisplayMode) == 0) {
parent->m_windowSize = {(unsigned)actualDisplayMode.w, (unsigned)actualDisplayMode.h}; parent->m_windowSize = {(unsigned)actualDisplayMode.w, (unsigned)actualDisplayMode.h};
SDL_SetWindowPosition(parent->m_sdlWindow, 0, 0);
SDL_SetWindowSize(parent->m_sdlWindow, parent->m_windowSize[0], parent->m_windowSize[1]);
parent->m_renderer->setScreenSize(parent->m_windowSize); parent->m_renderer->setScreenSize(parent->m_windowSize);
parent->m_application->windowChanged(parent->m_windowMode, parent->m_windowSize); parent->m_application->windowChanged(parent->m_windowMode, parent->m_windowSize);
} else { } else {
Logger::error("Couldn't get window display mode!"); Logger::error("Couldn't get desktop display mode!");
} }
} }
} }
@ -607,14 +619,14 @@ private:
if (event.window.event == SDL_WINDOWEVENT_MAXIMIZED || event.window.event == SDL_WINDOWEVENT_RESTORED) { if (event.window.event == SDL_WINDOWEVENT_MAXIMIZED || event.window.event == SDL_WINDOWEVENT_RESTORED) {
auto windowFlags = SDL_GetWindowFlags(m_sdlWindow); auto windowFlags = SDL_GetWindowFlags(m_sdlWindow);
if (windowFlags & SDL_WINDOW_MAXIMIZED) { if (windowFlags & SDL_WINDOW_MAXIMIZED)
m_windowMode = WindowMode::Maximized; m_windowMode = WindowMode::Maximized;
} else if (windowFlags & SDL_WINDOW_FULLSCREEN || windowFlags & SDL_WINDOW_FULLSCREEN_DESKTOP) { else if (windowFlags & SDL_WINDOW_FULLSCREEN)
if (m_windowMode != WindowMode::Fullscreen && m_windowMode != WindowMode::Borderless) m_windowMode = WindowMode::Fullscreen;
m_windowMode = WindowMode::Fullscreen; else if (windowFlags & SDL_WINDOW_BORDERLESS)
} else { m_windowMode = WindowMode::Borderless;
else
m_windowMode = WindowMode::Normal; m_windowMode = WindowMode::Normal;
}
m_application->windowChanged(m_windowMode, m_windowSize); m_application->windowChanged(m_windowMode, m_windowSize);

1
source/client/StarClientApplication.cpp
View File

@ -258,7 +258,6 @@ void ClientApplication::windowChanged(WindowMode windowMode, Vec2U screenSize) {
config->set("maximized", true); config->set("maximized", true);
config->set("fullscreen", false); config->set("fullscreen", false);
config->set("borderless", false); config->set("borderless", false);
config->set("windowedResolution", jsonFromVec2U(screenSize));
} else { } else {
config->set("maximized", false); config->set("maximized", false);
config->set("fullscreen", false); config->set("fullscreen", false);