-Some fixes to OSX retina scaling for window functions

-Implemented HiDPI detection and support for Godot Editor!

6 files changed, 29 insertions, 29 deletions

diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp
index f4d6af7e10..d5e6e3077e 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp
@@ -510,13 +510,13 @@ class EditorFontImportDialog : public ConfirmationDialog {
 
 		if (source->get_line_edit()->get_text()=="") {
 			error_dialog->set_text(TTR("No source font file!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 
 		if (dest->get_line_edit()->get_text()=="") {
 			error_dialog->set_text(TTR("No target font resource!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 
@@ -528,7 +528,7 @@ class EditorFontImportDialog : public ConfirmationDialog {
 
 		if (rimd.is_null()) {
 			error_dialog->set_text(TTR("Can't load/process source font."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 
@@ -536,7 +536,7 @@ class EditorFontImportDialog : public ConfirmationDialog {
 
 		if (err!=OK) {
 			error_dialog->set_text(TTR("Couldn't save font."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 
@@ -573,7 +573,7 @@ public:
 
 	void popup_import(const String& p_path) {
 
-		popup_centered(Size2(600,500));
+		popup_centered(Size2(600,500)*EDSCALE);
 
 		if (p_path!="") {
 
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index 45da42969c..c20515f0f3 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -173,7 +173,7 @@ public:
 
 	void popup_import(const String& p_path) {
 
-		popup_centered(Size2(400,400));
+		popup_centered(Size2(400,400)*EDSCALE);
 
 		if (p_path!="") {
 
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
index 120bdc6f44..ac0795f522 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
@@ -221,7 +221,7 @@ public:
 
 	void popup_import(const String& p_path) {
 
-		popup_centered(Size2(400,400));
+		popup_centered(Size2(400,400)*EDSCALE);
 		if (p_path!="") {
 
 			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
@@ -252,7 +252,7 @@ public:
 
 		if (samples.size()==0) {
 			error_dialog->set_text(TTR("No samples to import!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 		}
 
 		if (save_path->get_text().strip_edges()=="") {
@@ -293,7 +293,7 @@ public:
 			String dst = save_path->get_text();
 			if (dst=="") {
 				error_dialog->set_text(TTR("Save path is empty!"));
-				error_dialog->popup_centered(Size2(200,100));
+				error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			}
 
 			dst = dst.plus_file(samples[i].get_file().basename()+".smp");
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index 3effb1d0aa..41dfb748fc 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -674,7 +674,7 @@ void EditorSceneImportDialog::_open_and_import() {
 
 	if (unsaved) {
 
-		confirm_open->popup_centered_minsize(Size2(300,80));
+		confirm_open->popup_centered_minsize(Size2(300,80)*EDSCALE);
 	} else {
 		_import(true);
 	}
@@ -735,7 +735,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 		Ref<Script> scr = ResourceLoader::load(script_path->get_text());
 		if (!scr.is_valid()) {
 			error_dialog->set_text(TTR("Couldn't load post-import script."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 
@@ -744,7 +744,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 		if (!pi->get_script_instance()) {
 
 			error_dialog->set_text(TTR("Invalid/broken script for post-import."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 
@@ -788,7 +788,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 	if (err || !scene) {
 
 		error_dialog->set_text(TTR("Error importing scene."));
-		error_dialog->popup_centered(Size2(200,100));
+		error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 		return;
 	}
 
@@ -813,7 +813,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 		if (err) {
 
 			error_dialog->set_text(TTR("Error importing scene."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 		}
 		if (wip_open)
@@ -857,7 +857,7 @@ void EditorSceneImportDialog::_import_confirm() {
 
 		wip_save_file="";
 		error_dialog->set_text(TTR("Error importing scene."));
-		error_dialog->popup_centered(Size2(200,100));
+		error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 		return;
 	}
 
@@ -892,7 +892,7 @@ void EditorSceneImportDialog::_browse_script() {
 
 void EditorSceneImportDialog::popup_import(const String &p_from) {
 
-	popup_centered(Size2(750,550));
+	popup_centered(Size2(750,550)*EDSCALE);
 	if (p_from!="") {
 		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_from);
 		if (rimd.is_null())
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 2376f3a395..21e7ee36bb 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -352,7 +352,7 @@ void EditorTextureImportDialog::_import() {
 	if (!files.size()) {
 
 		error_dialog->set_text(TTR("Please specify some files!"));
-		error_dialog->popup_centered(Size2(200,100));
+		error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 		return;
 	}
 
@@ -382,7 +382,7 @@ void EditorTextureImportDialog::_import() {
 		if (files.size()==0) {
 
 			error_dialog->set_text(TTR("At least one file needed for Atlas."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 
 		}
@@ -406,7 +406,7 @@ void EditorTextureImportDialog::_import() {
 		if (err) {
 
 			error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 
 		}
@@ -415,7 +415,7 @@ void EditorTextureImportDialog::_import() {
 		if (files.size()!=1) {
 
 			error_dialog->set_text(TTR("Only one file is required for large texture."));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 
 		}
@@ -439,7 +439,7 @@ void EditorTextureImportDialog::_import() {
 		if (err) {
 
 			error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 
 		}
@@ -464,7 +464,7 @@ void EditorTextureImportDialog::_import() {
 			if (err) {
 
 				error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
-				error_dialog->popup_centered(Size2(200,100));
+				error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 				return;
 
 			}
@@ -492,7 +492,7 @@ void EditorTextureImportDialog::_browse_target() {
 
 void EditorTextureImportDialog::popup_import(const String& p_from) {
 
-	popup_centered(Size2(600,500));
+	popup_centered(Size2(600,500)*EDSCALE);
 	if (p_from!="") {
 		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_from);
 		ERR_FAIL_COND(!rimd.is_valid());
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.cpp b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
index 2b5bd29ac8..aa36fefdb7 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
@@ -65,7 +65,7 @@ public:
 		if (!f) {
 
 			error_dialog->set_text(TTR("Invalid source!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 
 		}
@@ -76,7 +76,7 @@ public:
 		if (csvh.size()<2) {
 
 			error_dialog->set_text(TTR("Invalid translation source!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			return;
 
 		}
@@ -171,7 +171,7 @@ public:
 
 	void popup_import(const String& p_from) {
 
-		popup_centered(Size2(400,400));
+		popup_centered(Size2(400,400)*EDSCALE);
 
 		if (p_from!="") {
 
@@ -232,12 +232,12 @@ public:
 
 		if (items.size()==0) {
 			error_dialog->set_text(TTR("No items to import!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 		}
 
 		if (!save_path->get_text().begins_with("res://")) {
 			error_dialog->set_text(TTR("No target path!"));
-			error_dialog->popup_centered(Size2(200,100));
+			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 		}
 
 		EditorProgress progress("import_xl",TTR("Import Translations"),items.size());
@@ -259,7 +259,7 @@ public:
 			Error err = plugin->import(savefile,imd);
 			if (err!=OK) {
 				error_dialog->set_text(TTR("Couldn't import!"));
-				error_dialog->popup_centered(Size2(200,100));
+				error_dialog->popup_centered(Size2(200,100)*EDSCALE);
 			} else if (add_to_project->is_pressed()) {
 
 				ProjectSettings::get_singleton()->add_translation(savefile);