Browse Source

Only show Close Tab confirmation when script has unsaved change;Update Close Tab message to emphasize the fact script will be saved when closing tab;Stop dumping 'applying code' message to console

marynate 10 years ago
parent
commit
d2a0f86d9f
1 changed files with 7 additions and 4 deletions
  1. 7 4
      tools/editor/plugins/script_editor_plugin.cpp

+ 7 - 4
tools/editor/plugins/script_editor_plugin.cpp

@@ -188,7 +188,7 @@ void ScriptTextEditor::apply_code() {
 
 
 	if (script.is_null())
 	if (script.is_null())
 		return;
 		return;
-	print_line("applying code");
+//	print_line("applying code");
 	script->set_source_code(get_text_edit()->get_text());
 	script->set_source_code(get_text_edit()->get_text());
 	script->update_exports();
 	script->update_exports();
 }
 }
@@ -1033,9 +1033,12 @@ void ScriptEditor::_menu_option(int p_option) {
 				editor->emit_signal("request_help", text);
 				editor->emit_signal("request_help", text);
 		} break;
 		} break;
 		case WINDOW_CLOSE: {
 		case WINDOW_CLOSE: {
-
-			erase_tab_confirm->set_text("Close Tab?:\n\""+current->get_name()+"\"");
-			erase_tab_confirm->popup_centered(Point2(250,80));
+			if (current->get_text_edit()->get_version()!=current->get_text_edit()->get_saved_version()) {
+				erase_tab_confirm->set_text("Close and save changes?\n\""+current->get_name()+"\"");
+				erase_tab_confirm->popup_centered(Point2(250,80));
+			} else {
+				_close_current_tab();
+			}
 		} break;
 		} break;
 		case WINDOW_MOVE_LEFT: {
 		case WINDOW_MOVE_LEFT: {