mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-16 23:06:03 +00:00
Fix Xbox link error from IsRectEmpty
This commit is contained in:

committed by
Sam Lantinga

parent
d7a56b93d5
commit
376a3cd100
@@ -331,6 +331,12 @@ void WIN_RectToRECT(const SDL_Rect *sdlrect, RECT *winrect)
|
|||||||
winrect->bottom = sdlrect->y + sdlrect->h - 1;
|
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,
|
/* 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 */
|
based on SDL_windows_main.c, placed in the public domain by Sam Lantinga 4/13/98 */
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
|
@@ -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 RECT *winrect, SDL_Rect *sdlrect);
|
||||||
extern void WIN_RectToRECT(const SDL_Rect *sdlrect, RECT *winrect);
|
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++ */
|
/* Ends C function definitions when using C++ */
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
@@ -1243,7 +1243,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!GetClientRect(hwnd, &rect) || IsRectEmpty(&rect)) {
|
if (!GetClientRect(hwnd, &rect) || WIN_IsRectEmpty(&rect)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ClientToScreen(hwnd, (LPPOINT)&rect);
|
ClientToScreen(hwnd, (LPPOINT)&rect);
|
||||||
@@ -1404,7 +1404,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||||||
RECT rect;
|
RECT rect;
|
||||||
float x, y;
|
float x, y;
|
||||||
|
|
||||||
if (!GetClientRect(hwnd, &rect) || IsRectEmpty(&rect)) {
|
if (!GetClientRect(hwnd, &rect) || WIN_IsRectEmpty(&rect)) {
|
||||||
if (inputs) {
|
if (inputs) {
|
||||||
SDL_small_free(inputs, isstack);
|
SDL_small_free(inputs, isstack);
|
||||||
}
|
}
|
||||||
|
@@ -825,7 +825,7 @@ void WIN_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *
|
|||||||
HWND hwnd = data->hwnd;
|
HWND hwnd = data->hwnd;
|
||||||
RECT rect;
|
RECT rect;
|
||||||
|
|
||||||
if (GetClientRect(hwnd, &rect) && !IsRectEmpty(&rect)) {
|
if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
|
||||||
*w = rect.right;
|
*w = rect.right;
|
||||||
*h = rect.bottom;
|
*h = rect.bottom;
|
||||||
} else {
|
} else {
|
||||||
@@ -1358,7 +1358,7 @@ void WIN_UpdateClipCursor(SDL_Window *window)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (SDL_memcmp(&rect, &clipped_rect, sizeof(rect)) != 0) {
|
if (SDL_memcmp(&rect, &clipped_rect, sizeof(rect)) != 0) {
|
||||||
if (!IsRectEmpty(&rect)) {
|
if (!WIN_IsRectEmpty(&rect)) {
|
||||||
if (ClipCursor(&rect)) {
|
if (ClipCursor(&rect)) {
|
||||||
data->cursor_clipped_rect = rect;
|
data->cursor_clipped_rect = rect;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user