Fix Xbox link error from IsRectEmpty

This commit is contained in:
Caleb Cornett authored and Sam Lantinga committed 2023-05-21 19:09:28 -07:00
1 parent d7a56b93d5
commit 376a3cd100
4 files changed
+13 -4

No files matched your search

+6
View File
@@ -331,6 +331,12 @@ void WIN_RectToRECT(const SDL_Rect *sdlrect, RECT *winrect)
winrect->bottom = sdlrect->y + sdlrect->h - 1;
}
BOOL WIN_IsRectEmpty(const RECT *rect)
{
/* Calculating this manually because UWP and Xbox do not support Win32 IsRectEmpty. */
return (rect->right <= rect->left) || (rect->bottom <= rect->top);
}
/* Win32-specific SDL_RunApp(), which does most of the SDL_main work,
based on SDL_windows_main.c, placed in the public domain by Sam Lantinga 4/13/98 */
#ifdef __WIN32__
+3
View File
@@ -151,6 +151,9 @@ extern BOOL WIN_IsEqualIID(REFIID a, REFIID b);
extern void WIN_RECTToRect(const RECT *winrect, SDL_Rect *sdlrect);
extern void WIN_RectToRECT(const SDL_Rect *sdlrect, RECT *winrect);
/* Returns SDL_TRUE if the rect is empty */
extern BOOL WIN_IsRectEmpty(const RECT *rect);
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
+2 -2
View File
@@ -1243,7 +1243,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break;
}
if (!GetClientRect(hwnd, &rect) || IsRectEmpty(&rect)) {
if (!GetClientRect(hwnd, &rect) || WIN_IsRectEmpty(&rect)) {
break;
}
ClientToScreen(hwnd, (LPPOINT)&rect);
@@ -1404,7 +1404,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
RECT rect;
float x, y;
if (!GetClientRect(hwnd, &rect) || IsRectEmpty(&rect)) {
if (!GetClientRect(hwnd, &rect) || WIN_IsRectEmpty(&rect)) {
if (inputs) {
SDL_small_free(inputs, isstack);
}
+2 -2
View File
@@ -825,7 +825,7 @@ void WIN_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *
HWND hwnd = data->hwnd;
RECT rect;
if (GetClientRect(hwnd, &rect) && !IsRectEmpty(&rect)) {
if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
*w = rect.right;
*h = rect.bottom;
} else {
@@ -1358,7 +1358,7 @@ void WIN_UpdateClipCursor(SDL_Window *window)
}
}
if (SDL_memcmp(&rect, &clipped_rect, sizeof(rect)) != 0) {
if (!IsRectEmpty(&rect)) {
if (!WIN_IsRectEmpty(&rect)) {
if (ClipCursor(&rect)) {
data->cursor_clipped_rect = rect;
}