mirror of
https://github.com/yawut/SDL.git
synced 2026-09-07 08:36:19 -05:00
Fixed bug 1496 - SDLView not created for a Cocoa window, resulting in missing right mouse clicks
When you create an nswindow it automatically gets a default view, so we'll just create an SDLView if we're creating the window.
This commit is contained in:
@@ -530,14 +530,6 @@ SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created
|
||||
/* Fill in the SDL window with the window data */
|
||||
{
|
||||
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
|
||||
NSView *contentView = [ nswindow contentView ];
|
||||
/* Create view if not already exists */
|
||||
if (!contentView) {
|
||||
contentView = [[SDLView alloc] initWithFrame:rect];
|
||||
[nswindow setContentView: contentView];
|
||||
[contentView release];
|
||||
}
|
||||
|
||||
ConvertNSRect(&rect);
|
||||
window->x = (int)rect.origin.x;
|
||||
window->y = (int)rect.origin.y;
|
||||
@@ -627,6 +619,12 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window)
|
||||
}
|
||||
nswindow = [[SDLWindow alloc] initWithContentRect:rect styleMask:style backing:NSBackingStoreBuffered defer:YES screen:screen];
|
||||
|
||||
// Create a default view for this window
|
||||
rect = [nswindow contentRectForFrameRect:[nswindow frame]];
|
||||
NSView *contentView = [[SDLView alloc] initWithFrame:rect];
|
||||
[nswindow setContentView: contentView];
|
||||
[contentView release];
|
||||
|
||||
[pool release];
|
||||
|
||||
if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) {
|
||||
|
||||
Reference in New Issue
Block a user