diff options
| author | marcelofg55 <marcelofg55@gmail.com> | 2016-06-04 12:35:00 -0300 |
|---|---|---|
| committer | marcelofg55 <marcelofg55@gmail.com> | 2016-06-04 12:35:00 -0300 |
| commit | 76ab7d3886c5a5e7c777e3cd9869e7b428247c06 (patch) | |
| tree | 1c718148adea40d88878b2700a1c45cb106cbbae /platform/osx | |
| parent | 280e3611b90c40fc26c7b7295430703f70f50f03 (diff) | |
Right click->Quit on the godot icon will now close the application on OSX.
Fixed get_window_position that missed a return on OSX.
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/os_osx.mm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 1d97ffacb6..b5503fcd73 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -139,12 +139,10 @@ static int button_mask=0; - (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) - _GodotInputWindowCloseRequest(window); -*/ - return NSTerminateCancel; + return NSTerminateCancel; } - (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); wp*=display_scale; + return wp; }; |