mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Fix resize-to-nearest could be larger than desktop

Browse source 
This fixes the possibility of the "resize to nearest" graphics option
resizing the game window to be bigger than the resolution of the user's
desktop monitor.

To fix this, just subtract multiples of 320x240 until the chosen
multiple is smaller than the dimensions of the desktop.

Discord user Dzhake discovered this issue.
This commit is contained in:
Misa 2024-02-04 17:53:57 -08:00 committed by Misa Elizabeth Kai
parent 929aaebc84
commit 365ee963eb
1 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
desktop_version/src/Screen.cpp
View file

@ -179,6 +179,25 @@ void Screen::ResizeScreen(int x, int y)
} }
} }
static void constrain_to_desktop(int display_index, int* width, int* height)
{
SDL_DisplayMode display_mode = {};
int success = SDL_GetDesktopDisplayMode(display_index, &display_mode);
if (success != 0)
{
vlog_error("Could not get desktop display mode: %s", SDL_GetError());
return;
}
while ((*width > display_mode.w || *height > display_mode.h)
&& *width > SCREEN_WIDTH_PIXELS && *height > SCREEN_HEIGHT_PIXELS)
{
// We are too big, take away one multiple
*width -= SCREEN_WIDTH_PIXELS;
*height -= SCREEN_HEIGHT_PIXELS;
}
}
void Screen::ResizeToNearestMultiple(void) void Screen::ResizeToNearestMultiple(void)
{ {
int w, h; int w, h;
@ -228,12 +247,25 @@ void Screen::ResizeToNearestMultiple(void)
if (using_width) if (using_width)
{ {
ResizeScreen(final_dimension, final_dimension / 4 * 3); w = final_dimension;
h = final_dimension / 4 * 3;
} }
else else
{ {
ResizeScreen(final_dimension * 4 / 3, final_dimension); w = final_dimension * 4 / 3;
h = final_dimension;
} }
windowDisplay = SDL_GetWindowDisplayIndex(m_window);
if (windowDisplay < 0)
{
vlog_error("Could not get display index: %s", SDL_GetError());
windowDisplay = 0;
}
constrain_to_desktop(windowDisplay, &w, &h);
ResizeScreen(w, h);
} }
void Screen::GetScreenSize(int* x, int* y) void Screen::GetScreenSize(int* x, int* y)