mirror of
https://github.com/love2d/megasource.git
synced 2026-08-20 04:30:45 +02:00
update SDL to libsdl-org/SDL@b8036bd
This commit is contained in:
@@ -1843,7 +1843,7 @@ static int SDLCALL video_setWindowCenteredOnDisplay(void *arg)
|
||||
SDLTest_AssertCheck(currentW == w, "Validate width (current: %d, expected: %d)", currentW, w);
|
||||
SDLTest_AssertCheck(currentH == h, "Validate height (current: %d, expected: %d)", currentH, h);
|
||||
}
|
||||
if (video_driver_is_wayland) {
|
||||
if (video_driver_is_emscripten || video_driver_is_wayland) {
|
||||
SDLTest_Log("Skipping window position validation: %s driver does not support window positioning", video_driver);
|
||||
} else {
|
||||
SDLTest_AssertCheck(currentX == expectedX, "Validate x (current: %d, expected: %d)", currentX, expectedX);
|
||||
@@ -1879,7 +1879,7 @@ static int SDLCALL video_setWindowCenteredOnDisplay(void *arg)
|
||||
SDLTest_AssertCheck(currentW == w, "Validate width (current: %d, expected: %d)", currentW, w);
|
||||
SDLTest_AssertCheck(currentH == h, "Validate height (current: %d, expected: %d)", currentH, h);
|
||||
}
|
||||
if (video_driver_is_wayland) {
|
||||
if (video_driver_is_emscripten || video_driver_is_wayland) {
|
||||
SDLTest_Log("Skipping window position validation: %s driver does not support window positioning", video_driver);
|
||||
} else {
|
||||
SDLTest_AssertCheck(currentX == expectedX, "Validate x (current: %d, expected: %d)", currentX, expectedX);
|
||||
@@ -2133,7 +2133,54 @@ static int SDLCALL video_getSetWindowState(void *arg)
|
||||
SDLTest_AssertCheck(windowedW == currentW, "Verify returned width; expected: %d, got: %d", windowedW, currentW);
|
||||
SDLTest_AssertCheck(windowedH == currentH, "Verify returned height; expected: %d, got: %d", windowedH, currentH);
|
||||
|
||||
/* Maximize, change size, and restore */
|
||||
/* Maximize, restore, and change size */
|
||||
result = SDL_MaximizeWindow(window);
|
||||
SDLTest_AssertPass("SDL_MaximizeWindow()");
|
||||
SDLTest_AssertCheck(result == true, "Verify return value; expected: true, got: %d", result);
|
||||
|
||||
result = SDL_RestoreWindow(window);
|
||||
SDLTest_AssertPass("SDL_RestoreWindow()");
|
||||
SDLTest_AssertCheck(result == true, "Verify return value; expected: true, got: %d", result);
|
||||
|
||||
desiredW = windowedW + 10;
|
||||
desiredH = windowedH + 10;
|
||||
result = SDL_SetWindowSize(window, desiredW, desiredH);
|
||||
SDLTest_AssertPass("SDL_SetWindowSize()");
|
||||
SDLTest_AssertCheck(result == true, "Verify return value; expected: true, got: %d", result);
|
||||
|
||||
if (!skipPos) {
|
||||
desiredX = windowedX + 10;
|
||||
desiredY = windowedY + 10;
|
||||
result = SDL_SetWindowPosition(window, desiredX, desiredY);
|
||||
SDLTest_AssertPass("SDL_SetWindowPosition()");
|
||||
SDLTest_AssertCheck(result == true, "Verify return value; expected: true, got: %d", result);
|
||||
}
|
||||
|
||||
result = SDL_SyncWindow(window);
|
||||
SDLTest_AssertPass("SDL_SyncWindow()");
|
||||
SDLTest_AssertCheck(result == true, "Verify return value; expected: true, got: %d", result);
|
||||
|
||||
flags = SDL_GetWindowFlags(window);
|
||||
SDLTest_AssertPass("SDL_GetWindowFlags()");
|
||||
SDLTest_AssertCheck(!(flags & SDL_WINDOW_MAXIMIZED), "Verify that the `SDL_WINDOW_MAXIMIZED` flag is cleared: %s", !(flags & SDL_WINDOW_MAXIMIZED) ? "true" : "false");
|
||||
|
||||
if (!skipPos) {
|
||||
currentX = desiredX + 1;
|
||||
currentY = desiredY + 1;
|
||||
SDL_GetWindowPosition(window, ¤tX, ¤tY);
|
||||
SDLTest_AssertPass("Call to SDL_GetWindowPosition()");
|
||||
SDLTest_AssertCheck(desiredX == currentX, "Verify returned X coordinate; expected: %d, got: %d", desiredX, currentX);
|
||||
SDLTest_AssertCheck(desiredY == currentY, "Verify returned Y coordinate; expected: %d, got: %d", desiredY, currentY);
|
||||
}
|
||||
|
||||
currentW = desiredW + 1;
|
||||
currentH = desiredH + 1;
|
||||
SDL_GetWindowSize(window, ¤tW, ¤tH);
|
||||
SDLTest_AssertPass("Call to SDL_GetWindowSize()");
|
||||
SDLTest_AssertCheck(desiredW == currentW, "Verify returned width; expected: %d, got: %d", desiredW, currentW);
|
||||
SDLTest_AssertCheck(desiredH == currentH, "Verify returned height; expected: %d, got: %d", desiredH, currentH);
|
||||
|
||||
/* Maximize, change size/position (should be ignored), and restore. */
|
||||
result = SDL_MaximizeWindow(window);
|
||||
SDLTest_AssertPass("SDL_MaximizeWindow()");
|
||||
SDLTest_AssertCheck(result == true, "Verify return value; expected: true, got: %d", result);
|
||||
@@ -2165,20 +2212,20 @@ static int SDLCALL video_getSetWindowState(void *arg)
|
||||
SDLTest_AssertCheck(!(flags & SDL_WINDOW_MAXIMIZED), "Verify that the `SDL_WINDOW_MAXIMIZED` flag is cleared: %s", !(flags & SDL_WINDOW_MAXIMIZED) ? "true" : "false");
|
||||
|
||||
if (!skipPos) {
|
||||
currentX = desiredX + 1;
|
||||
currentY = desiredY + 1;
|
||||
SDL_GetWindowPosition(window, ¤tX, ¤tY);
|
||||
int previousX = desiredX + 1;
|
||||
int previousY = desiredY + 1;
|
||||
SDL_GetWindowPosition(window, &previousX, &previousY);
|
||||
SDLTest_AssertPass("Call to SDL_GetWindowPosition()");
|
||||
SDLTest_AssertCheck(desiredX == currentX, "Verify returned X coordinate; expected: %d, got: %d", desiredX, currentX);
|
||||
SDLTest_AssertCheck(desiredY == currentY, "Verify returned Y coordinate; expected: %d, got: %d", desiredY, currentY);
|
||||
SDLTest_AssertCheck(desiredX == currentX, "Verify returned X coordinate; expected: %d, got: %d", previousX, currentX);
|
||||
SDLTest_AssertCheck(desiredY == currentY, "Verify returned Y coordinate; expected: %d, got: %d", previousY, currentY);
|
||||
}
|
||||
|
||||
currentW = desiredW + 1;
|
||||
currentH = desiredH + 1;
|
||||
SDL_GetWindowSize(window, ¤tW, ¤tH);
|
||||
int previousW = desiredW + 1;
|
||||
int previousH = desiredH + 1;
|
||||
SDL_GetWindowSize(window, &previousW, &previousH);
|
||||
SDLTest_AssertPass("Call to SDL_GetWindowSize()");
|
||||
SDLTest_AssertCheck(desiredW == currentW, "Verify returned width; expected: %d, got: %d", desiredW, currentW);
|
||||
SDLTest_AssertCheck(desiredH == currentH, "Verify returned height; expected: %d, got: %d", desiredH, currentH);
|
||||
SDLTest_AssertCheck(desiredW == currentW, "Verify returned width; expected: %d, got: %d", previousW, currentW);
|
||||
SDLTest_AssertCheck(desiredH == currentH, "Verify returned height; expected: %d, got: %d", previousH, currentH);
|
||||
|
||||
/* Change size and position, maximize and restore */
|
||||
desiredW = windowedW - 5;
|
||||
|
||||
Reference in New Issue
Block a user