Przeglądaj źródła

Merge pull request #5035 from marcelofg55/master

Right click->Quit on the godot icon will close the application on OSX
Rémi Verschelde 9 lat temu
rodzic
commit
5b6a8eca94
1 zmienionych plików z 4 dodań i 5 usunięć
  1. 4 5
      platform/osx/os_osx.mm

+ 4 - 5
platform/osx/os_osx.mm

@@ -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)
-	_GodotInputWindowCloseRequest(window);
-*/
-    return NSTerminateCancel;
+	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;
 };
 };