Jelajahi Sumber

Quitting fix on Mac

Ivan Safrin 10 tahun lalu
induk
melakukan
f13d37c4dd

+ 2 - 1
build/osx/PolycodeStudio/PolycodeStudio/AppDelegate.m

@@ -100,14 +100,15 @@ void PolycodeAppEventHandler::handleEvent(Event *evt) {
 {
 {
     app->saveConfigFile();
     app->saveConfigFile();
     bool retVal = app->quitApp();
     bool retVal = app->quitApp();
-
     
     
     NSApplicationTerminateReply reply = NSTerminateLater;
     NSApplicationTerminateReply reply = NSTerminateLater;
     if(retVal) {
     if(retVal) {
         reply = NSTerminateNow;
         reply = NSTerminateNow;
         app->core->Shutdown();
         app->core->Shutdown();
+        [[NSApplication sharedApplication] replyToApplicationShouldTerminate:YES];
         
         
     }
     }
+    [[NSApplication sharedApplication] replyToApplicationShouldTerminate:NO];
     return reply;
     return reply;
 }
 }
 
 

+ 6 - 6
src/ide/ToolWindows.cpp

@@ -25,7 +25,7 @@
 
 
 TextInputPopup::TextInputPopup() : UIWindow(L"", 300, 80) {
 TextInputPopup::TextInputPopup() : UIWindow(L"", 300, 80) {
 	
 	
-	textInput = new UITextInput(false, 290, 12);	
+	textInput = new UITextInput(false, 290, 14);
 	addFocusChild(textInput);
 	addFocusChild(textInput);
 	textInput->setPosition(padding, 35);
 	textInput->setPosition(padding, 35);
 	textInput->addEventListener(this, Event::COMPLETE_EVENT);
 	textInput->addEventListener(this, Event::COMPLETE_EVENT);
@@ -86,7 +86,7 @@ TextInputPopup::~TextInputPopup() {
 }
 }
 
 
 MessagePopup::MessagePopup() : UIWindow("", 300, 80) {
 MessagePopup::MessagePopup() : UIWindow("", 300, 80) {
-    captionLabel = new UILabel("This is a caption", 12);
+    captionLabel = new UILabel("This is a caption", 14);
 	addFocusChild(captionLabel);
 	addFocusChild(captionLabel);
 	captionLabel->setPosition(padding, 35);
 	captionLabel->setPosition(padding, 35);
     
     
@@ -132,7 +132,7 @@ void MessagePopup::handleEvent(Event *event) {
 
 
 YesNoPopup::YesNoPopup() : UIWindow(L"", 300, 80) {
 YesNoPopup::YesNoPopup() : UIWindow(L"", 300, 80) {
 	
 	
-	captionLabel = new UILabel("This is a caption", 12);	
+	captionLabel = new UILabel("This is a caption", 14);
 	addFocusChild(captionLabel);
 	addFocusChild(captionLabel);
 	captionLabel->setPosition(padding, 35);
 	captionLabel->setPosition(padding, 35);
 		
 		
@@ -196,7 +196,7 @@ void YesNoCancelPopup::onGainFocus() {
 
 
 YesNoCancelPopup::YesNoCancelPopup() : UIWindow(L"", 300, 80) {
 YesNoCancelPopup::YesNoCancelPopup() : UIWindow(L"", 300, 80) {
 	
 	
-	captionLabel = new UILabel("This is a caption", 12);	
+	captionLabel = new UILabel("This is a caption", 14);
 	addFocusChild(captionLabel);
 	addFocusChild(captionLabel);
 	captionLabel->setPosition(padding, 35);
 	captionLabel->setPosition(padding, 35);
 		
 		
@@ -260,7 +260,7 @@ YesNoCancelPopup::~YesNoCancelPopup() {
 }
 }
 
 
 AssetImporterWindow::AssetImporterWindow() : UIWindow("3D Asset Importer", 650, 330) {
 AssetImporterWindow::AssetImporterWindow() : UIWindow("3D Asset Importer", 650, 330) {
-	filesToImportLabel = new UILabel("Files that will be imported:", 12);
+	filesToImportLabel = new UILabel("Files that will be imported:", 14);
 	addFocusChild(filesToImportLabel);
 	addFocusChild(filesToImportLabel);
 	filesToImportLabel->setPosition(padding, 35);
 	filesToImportLabel->setPosition(padding, 35);
 	
 	
@@ -387,7 +387,7 @@ void AssetImporterWindow::clearFiles() {
 }
 }
 
 
 void AssetImporterWindow::addFile(String fileName) {
 void AssetImporterWindow::addFile(String fileName) {
-	UILabel *fileLabel = new UILabel(fileName, 12);
+	UILabel *fileLabel = new UILabel(fileName, 14);
 	filesAnchor->addFocusChild(fileLabel);
 	filesAnchor->addFocusChild(fileLabel);
 	fileLabel->setPosition(0.0, 14 * fileLabels.size());
 	fileLabel->setPosition(0.0, 14 * fileLabels.size());