Cocoa : fix drag and drop was no more operational after having fullscreened the window
authorDamien Plisson <damien.plisson@yahoo.fr>
Sat, 4 Dec 2010 14:26:45 +0000 (14:26 +0000)
committerDamien Plisson <damien.plisson@yahoo.fr>
Sat, 4 Dec 2010 14:26:45 +0000 (14:26 +0000)
intern/ghost/intern/GHOST_WindowCocoa.mm

index c43a9b57721cc6d6d4e0d54bf809ab194362d0e5..0b6393c06b6e40c888fc59504f6dc43fade341af 100644 (file)
@@ -777,12 +777,14 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
                                [tmpWindow setReleasedWhenClosed:NO];
                                [tmpWindow setAcceptsMouseMovedEvents:YES];
                                [tmpWindow setDelegate:[m_window delegate]];
+                               [tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
+                                                                                                  NSStringPboardType, NSTIFFPboardType, nil]];
                                
                                //Assign the openGL view to the new window
                                [tmpWindow setContentView:m_openGLView];
                                
                                //Show the new window
-                               [tmpWindow makeKeyAndOrderFront:nil];
+                               [tmpWindow makeKeyAndOrderFront:m_openGLView];
                                //Close and release old window
                                [m_window setDelegate:nil]; // To avoid the notification of "window closed" event
                                [m_window close];
@@ -835,6 +837,10 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
                                [tmpWindow setReleasedWhenClosed:NO];
                                [tmpWindow setAcceptsMouseMovedEvents:YES];
                                [tmpWindow setDelegate:[m_window delegate]];
+                               [tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
+                                                                                                  NSStringPboardType, NSTIFFPboardType, nil]];
+                               //Forbid to resize the window below the blender defined minimum one
+                               [tmpWindow setContentMinSize:NSMakeSize(320, 240)];
                                
                                //Assign the openGL view to the new window
                                [tmpWindow setContentView:m_openGLView];