Fixed bug 1303 - SDL_CreateFromWindow duplicates window (Cocoa only)

Jens K?hler 2011-09-09 04:47:40 PDT When calling SDL_CreateWindowFrom with a NSWindow which already contains a NSView, the window will be duplicated because another NSView is added. I attached a possible fix that prevents the creation of a second NSView.
libsdl-org · Jan 8, 2012 · 81102e2 · 81102e2
1 parent 91dfe95
commit 81102e2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
@@ -526,9 +526,13 @@ - (void)rightMouseDown:(NSEvent *)theEvent
     /* Fill in the SDL window with the window data */
     {
         NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
-        NSView *contentView = [[SDLView alloc] initWithFrame:rect];
-        [nswindow setContentView: contentView];
-        [contentView release];
+        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;