Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-01-17 14:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Patched to compile.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-01-05 05:22:35 -05:00
parent 7605ccf68a
commit eeb899999f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/uikit/SDL_uikitappdelegate.m
View File

@ -451,10 +451,11 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh)
{ {
NSURL *fileURL = url.filePathURL; NSURL *fileURL = url.filePathURL;
if (fileURL != nil) { if (fileURL != nil) {
SDL_SendDropFile([fileURL.path UTF8String]); SDL_SendDropFile(NULL, [fileURL.path UTF8String]);
} else { } else {
SDL_SendDropFile([url.absoluteString UTF8String]); SDL_SendDropFile(NULL, [url.absoluteString UTF8String]);
} }
SDL_SendDropComplete(NULL);
return YES; return YES;
} }

5
src/video/windows/SDL_windowsmodes.c
View File

@ -23,6 +23,7 @@
#if SDL_VIDEO_DRIVER_WINDOWS #if SDL_VIDEO_DRIVER_WINDOWS
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
#include "../../../include/SDL_assert.h"
/* Windows CE compatibility */ /* Windows CE compatibility */
#ifndef CDS_FULLSCREEN #ifndef CDS_FULLSCREEN
@ -342,7 +343,7 @@ WIN_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
(LONG) (pDevMode->dmPosition.x + (pDevMode->dmPelsWidth / 2)), (LONG) (pDevMode->dmPosition.x + (pDevMode->dmPelsWidth / 2)),
(LONG) (pDevMode->dmPosition.y + (pDevMode->dmPelsHeight / 2)) (LONG) (pDevMode->dmPosition.y + (pDevMode->dmPelsHeight / 2))
}; };
HMONITOR hmon = MonitorFromPoint(&pt, MONITOR_DEFAULTTONULL); HMONITOR hmon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL);
MONITORINFO minfo; MONITORINFO minfo;
const RECT *work; const RECT *work;
BOOL rc = FALSE; BOOL rc = FALSE;
@ -360,7 +361,7 @@ WIN_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
return SDL_SetError("Couldn't find monitor data"); return SDL_SetError("Couldn't find monitor data");
} }
work = &minfo->rcWork; work = &minfo.rcWork;
rect->x = (int)SDL_ceil(work->left * data->ScaleX); rect->x = (int)SDL_ceil(work->left * data->ScaleX);
rect->y = (int)SDL_ceil(work->top * data->ScaleY); rect->y = (int)SDL_ceil(work->top * data->ScaleY);
rect->w = (int)SDL_ceil((work->right - work->left) * data->ScaleX); rect->w = (int)SDL_ceil((work->right - work->left) * data->ScaleX);

2
src/video/x11/SDL_x11modes.c
View File

@ -1095,9 +1095,9 @@ X11_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rec
&real_type, &real_format, &items_read, &real_type, &real_format, &items_read,
&items_left, &propdata); &items_left, &propdata);
if ((status == Success) && (items_read >= 4)) { if ((status == Success) && (items_read >= 4)) {
retval = 0;
const long *p = (long*) propdata; const long *p = (long*) propdata;
const SDL_Rect usable = { (int)p[0], (int)p[1], (int)p[2], (int)p[3] }; const SDL_Rect usable = { (int)p[0], (int)p[1], (int)p[2], (int)p[3] };
retval = 0;
if (!SDL_IntersectRect(rect, &usable, rect)) { if (!SDL_IntersectRect(rect, &usable, rect)) {
SDL_zerop(rect); SDL_zerop(rect);
} }