Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-19 23:34:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate UIScreenMode parameter from UIKit_AddDisplay

Browse Source
This commit is contained in:
Kees Bakker
2011-10-18 21:32:54 +02:00
parent e5554f4f2a
commit 4b46fb22ec
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/video/uikit/SDL_uikitvideo.m
View File

@@ -166,7 +166,7 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
static void
UIKit_AddDisplay(UIScreen *uiscreen, UIScreenMode *uimode, int w, int h)
UIKit_AddDisplay(UIScreen *uiscreen, int w, int h)
{
SDL_VideoDisplay display;
SDL_DisplayMode mode;
@@ -176,9 +176,14 @@ UIKit_AddDisplay(UIScreen *uiscreen, UIScreenMode *uimode, int w, int h)
mode.h = h;
mode.refresh_rate = 0;
[uimode retain]; // once for the desktop_mode
[uimode retain]; // once for the current_mode
mode.driverdata = uimode;
// UIScreenMode showed up in 3.2 (the iPad and later). We're
// misusing this supports_multiple_displays flag here for that.
if (!SDL_UIKit_supports_multiple_displays) {
UIScreenMode *uimode = [uiscreen currentMode];
[uimode retain]; // once for the desktop_mode
[uimode retain]; // once for the current_mode
mode.driverdata = uimode;
}
SDL_zero(display);
display.desktop_mode = mode;
@@ -202,9 +207,8 @@ UIKit_VideoInit(_THIS)
// Add the main screen.
UIScreen *uiscreen = [UIScreen mainScreen];
UIScreenMode *uiscreenmode = [uiscreen currentMode];
const CGSize size = [uiscreen bounds].size;
UIKit_AddDisplay(uiscreen, uiscreenmode, (int)size.width, (int)size.height);
UIKit_AddDisplay(uiscreen, (int)size.width, (int)size.height);
// If this is iPhoneOS < 3.2, all devices are one screen, 320x480 pixels.
// The iPad added both a larger main screen and the ability to use
@@ -213,9 +217,8 @@ UIKit_VideoInit(_THIS)
for (UIScreen *uiscreen in [UIScreen screens]) {
// Only add the other screens
if (uiscreen != [UIScreen mainScreen]) {
UIScreenMode *uiscreenmode = [uiscreen currentMode];
const CGSize size = [uiscreen bounds].size;
UIKit_AddDisplay(uiscreen, uiscreenmode, (int)size.width, (int)size.height);
UIKit_AddDisplay(uiscreen, (int)size.width, (int)size.height);
}
}
}