Skip to content

clean up SDL2 EndScreenDeviceChange() #2731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkast merged 1 commit into from
Sep 27, 2026
Merged

clean up SDL2 EndScreenDeviceChange() #2731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 1 addition & 35 deletions Platforms/Game/.SDL2/SDLGameWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,16 +537,6 @@ internal void EndScreenDeviceChange(int clientWidth, int clientHeight, bool will
_height = clientHeight;
}

if (!_wasMoved)
{
int posX = prevBounds.X + ((prevBounds.Width - clientWidth) / 2);
int posY = prevBounds.Y + ((prevBounds.Height - clientHeight) / 2);
SDL.WINDOW.GetBorderSize(_handle, out int borderTop, out int borderLeft, out int borderBottom, out int borderRight);
posX = Math.Max(posX, borderLeft);
posY = Math.Max(posY, borderTop);
SDL.WINDOW.SetPosition(Handle, posX, posY);
}

if (!_isFullScreen)
OnClientSizeChanged();

Expand All @@ -568,19 +558,7 @@ internal void EndScreenDeviceChange(int clientWidth, int clientHeight, bool will

if (!_wasMoved)
{
if (_isFullScreen)
{
// This centering only occurs when exiting fullscreen
// so it should center the window on the current display.

// We need to get the display information again in case
// the resolution of it was changed.
SDL.DISPLAY.GetBounds(windowDisplayIndex, out displayBounds);
int posX = displayBounds.X + displayBounds.Width / 2 - clientWidth / 2;
int posY = displayBounds.Y + displayBounds.Height / 2 - clientHeight / 2;
SDL.WINDOW.SetPosition(Handle, posX, posY);
}
else
if (!_isFullScreen)
{
int posX = prevBounds.X + ((prevBounds.Width - clientWidth) / 2);
int posY = prevBounds.Y + ((prevBounds.Height - clientHeight) / 2);
Expand All @@ -605,8 +583,6 @@ internal void EndScreenDeviceChange(int clientWidth, int clientHeight, bool will

internal void EndCreateDevice(int clientWidth, int clientHeight, bool willBeFullScreen, bool willBeExclusiveFullScreen)
{
Rectangle prevBounds = ClientBounds;

int windowDisplayIndex = SDL.DISPLAY.GetWindowDisplayIndex(Handle);
SDL.DISPLAY.GetBounds(windowDisplayIndex, out Sdl.Rectangle displayBounds);

Expand All @@ -633,16 +609,6 @@ internal void EndCreateDevice(int clientWidth, int clientHeight, bool willBeFull
_height = clientHeight;
}

if (!_wasMoved)
{
int posX = prevBounds.X + ((prevBounds.Width - clientWidth) / 2);
int posY = prevBounds.Y + ((prevBounds.Height - clientHeight) / 2);
SDL.WINDOW.GetBorderSize(_handle, out int borderTop, out int borderLeft, out int borderBottom, out int borderRight);
posX = Math.Max(posX, borderLeft);
posY = Math.Max(posY, borderTop);
SDL.WINDOW.SetPosition(Handle, posX, posY);
}

OnClientSizeChanged();

_isFullScreen = true;
Expand Down
Loading