From 51508845506387dd0a61c8a7712aa4335b8635af Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Sat, 4 Dec 2010 14:26:45 +0000 Subject: Cocoa : fix drag and drop was no more operational after having fullscreened the window --- intern/ghost/intern/GHOST_WindowCocoa.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index c43a9b57721..0b6393c06b6 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -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]; -- cgit v1.2.3