godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Right click->Quit on the godot icon will now close the application on OSX. 

Fixed get_window_position that missed a return on OSX.
This commit is contained in:
marcelofg55 2016-06-04 12:35:00 -03:00
parent 280e3611b9
commit 76ab7d3886
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/osx/os_osx.mm
View File

@ -139,12 +139,10 @@ static int button_mask=0;
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{ {
/* _Godotwindow* window; if (OS_OSX::singleton->get_main_loop())
OS_OSX::singleton->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST);
for (window = _Godot.windowListHead; window; window = window->next) return NSTerminateCancel;
_GodotInputWindowCloseRequest(window);
*/
return NSTerminateCancel;
} }
- (void)applicationDidHide:(NSNotification *)notification - (void)applicationDidHide:(NSNotification *)notification
@ -1463,6 +1461,7 @@ Point2 OS_OSX::get_window_position() const {
Size2 wp([window_object frame].origin.x, [window_object frame].origin.y); Size2 wp([window_object frame].origin.x, [window_object frame].origin.y);
wp*=display_scale; wp*=display_scale;
return wp;
}; };