Merge branch 'master' of https://github.com/okamstudio/godot

10 files changed, 30 insertions, 30 deletions

diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index f706d67f6..2e6947b52 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -336,7 +336,7 @@ void AnimationPlayerEditor::_animation_name_edited() {
 	String new_name = name->get_text();
 	if (new_name=="" || new_name.find(":")!=-1 || new_name.find("/")!=-1) {
 		error_dialog->set_text("ERROR: Invalid animation name!");
-		error_dialog->popup_centered(Size2(300,70));
+		error_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -347,7 +347,7 @@ void AnimationPlayerEditor::_animation_name_edited() {
 
 	if (player->has_animation(new_name)) {
 		error_dialog->set_text("ERROR: Animation Name Already Exists!");
-		error_dialog->popup_centered(Size2(300,70));
+		error_dialog->popup_centered_minsize();
 		return;
 	}
 
diff --git a/tools/editor/plugins/baked_light_editor_plugin.cpp b/tools/editor/plugins/baked_light_editor_plugin.cpp
index 0f02899dc..26524b243 100644
--- a/tools/editor/plugins/baked_light_editor_plugin.cpp
+++ b/tools/editor/plugins/baked_light_editor_plugin.cpp
@@ -180,7 +180,7 @@ void BakedLightEditor::_bake_pressed() {
 	ERR_FAIL_COND(!node);
 	if (node->get_baked_light().is_null()) {
 		err_dialog->set_text("BakedLightInstance does not contain a BakedLight resource.");
-		err_dialog->popup_centered(Size2(350,70));
+		err_dialog->popup_centered_minsize();
 		button_bake->set_pressed(false);
 		return;
 	}
@@ -242,7 +242,7 @@ void BakedLightEditor::_bake_lightmaps() {
 	if (err) {
 
 		err_dialog->set_text("Error baking to lightmaps!\nMake sure that a bake has just\n happened and that lightmaps are\n configured. ");
-		err_dialog->popup_centered(Size2(350,70));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp
index f8c75e1cf..2c64b2eb6 100644
--- a/tools/editor/plugins/mesh_editor_plugin.cpp
+++ b/tools/editor/plugins/mesh_editor_plugin.cpp
@@ -33,7 +33,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
 	Ref<Mesh> mesh = node->get_mesh();
 	if (mesh.is_null()) {
 		err_dialog->set_text("Mesh is empty!");
-		err_dialog->popup_centered(Size2(100,80));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -85,7 +85,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
 
 			if (node==get_tree()->get_edited_scene_root()) {
 				err_dialog->set_text("This doesn't work on scene root!");
-				err_dialog->popup_centered(Size2(100,50));
+				err_dialog->popup_centered_minsize();
 				return;
 			}
 			Ref<Shape> shape = mesh->create_trimesh_shape();
@@ -111,7 +111,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
 
 			if (node==get_tree()->get_edited_scene_root()) {
 				err_dialog->set_text("This doesn't work on scene root!");
-				err_dialog->popup_centered(Size2(100,50));
+				err_dialog->popup_centered_minsize();
 				return;
 			}
 			Ref<Shape> shape = mesh->create_convex_shape();
@@ -160,7 +160,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
 		} break;
 		case MENU_OPTION_CREATE_OUTLINE_MESH: {
 
-			outline_dialog->popup_centered(Size2(200,80));
+			outline_dialog->popup_centered_minsize();
 		} break;
 	}
 
@@ -171,7 +171,7 @@ void MeshInstanceEditor::_create_outline_mesh() {
 	Ref<Mesh> mesh = node->get_mesh();
 	if (mesh.is_null()) {
 		err_dialog->set_text("MeshInstance lacks a Mesh!");
-		err_dialog->popup_centered(Size2(100,50));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -179,7 +179,7 @@ void MeshInstanceEditor::_create_outline_mesh() {
 
 	if (mesho.is_null()) {
 		err_dialog->set_text("Could not create outline!");
-		err_dialog->popup_centered(Size2(100,50));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp
index b2b6cbe9b..93a953e64 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.cpp
+++ b/tools/editor/plugins/multimesh_editor_plugin.cpp
@@ -57,13 +57,13 @@ void MultiMeshEditor::_populate() {
 		if (multimesh.is_null()) {
 
 			err_dialog->set_text("No mesh source specified (and no MultiMesh set in node).");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 		if (multimesh->get_mesh().is_null()) {
 
 			err_dialog->set_text("No mesh source specified (and MultiMesh contains no Mesh).");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 
@@ -75,7 +75,7 @@ void MultiMeshEditor::_populate() {
 		if (!ms_node) {
 
 			err_dialog->set_text("Mesh source is invalid (Invalid Path).");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 
@@ -84,7 +84,7 @@ void MultiMeshEditor::_populate() {
 		if (!ms_instance) {
 
 			err_dialog->set_text("Mesh source is invalid (Not a MeshInstance).");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 
@@ -93,7 +93,7 @@ void MultiMeshEditor::_populate() {
 		if (mesh.is_null()) {
 
 			err_dialog->set_text("Mesh source is invalid (Contains no Mesh resource).");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 
@@ -102,7 +102,7 @@ void MultiMeshEditor::_populate() {
 	if (surface_source->get_text()=="") {
 
 		err_dialog->set_text("No surface source specified.");
-		err_dialog->popup_centered(Size2(300,100));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -111,7 +111,7 @@ void MultiMeshEditor::_populate() {
 	if (!ss_node) {
 
 		err_dialog->set_text("Surface source is invalid (Invalid Path).");
-		err_dialog->popup_centered(Size2(300,100));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -120,7 +120,7 @@ void MultiMeshEditor::_populate() {
 	if (!ss_instance) {
 
 		err_dialog->set_text("Surface source is invalid (Not Geometry).");
-		err_dialog->popup_centered(Size2(300,100));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -131,7 +131,7 @@ void MultiMeshEditor::_populate() {
 	if (geometry.size()==0) {
 
 		err_dialog->set_text("Surface source is invalid (No Faces).");
-		err_dialog->popup_centered(Size2(300,100));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp
index ebb45bc31..a3032a73d 100644
--- a/tools/editor/plugins/particles_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_editor_plugin.cpp
@@ -58,7 +58,7 @@ void ParticlesEditor::_node_selected(const NodePath& p_path){
 	if (!vi) {
 
 		err_dialog->set_text("Node does not contain geometry.");
-		err_dialog->popup_centered(Size2(300,100));
+		err_dialog->popup_centered_minsize();
 		return;
 	}
 
@@ -67,7 +67,7 @@ void ParticlesEditor::_node_selected(const NodePath& p_path){
 	if (geometry.size()==0) {
 
 		err_dialog->set_text("Node does not contain geometry (faces).");
-		err_dialog->popup_centered(Size2(300,100));
+		err_dialog->popup_centered_minsize();
 		return;
 
 	}
@@ -219,7 +219,7 @@ void ParticlesEditor::_generate_emission_points() {
 		if (!triangle_area_map.size() || area_accum==0) {
 
 			err_dialog->set_text("Faces contain no area!");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 
@@ -249,7 +249,7 @@ void ParticlesEditor::_generate_emission_points() {
 		if (gcount==0) {
 
 			err_dialog->set_text("No Faces!");
-			err_dialog->popup_centered(Size2(300,100));
+			err_dialog->popup_centered_minsize();
 			return;
 		}
 
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
index 3858bf2c6..d4b307f66 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -90,7 +90,7 @@ void Polygon2DEditor::_menu_option(int p_option) {
 			if (node->get_texture().is_null()) {
 
 				error->set_text("No texture in this polygon.\nSet a texture to be able to edit UV.");
-				error->popup_centered_minsize(Size2(300,70));
+				error->popup_centered_minsize();
 				return;
 			}
 
diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp
index d9726cac2..f0de551ad 100644
--- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -72,7 +72,7 @@ void ResourcePreloaderEditor::_file_load_request(const String& p_path) {
 		dialog->set_title("Error!");
 		//dialog->get_cancel()->set_text("Close");
 		dialog->get_ok()->set_text("Close");
-		dialog->popup_centered(Size2(300,60));
+		dialog->popup_centered_minsize();
 		return; ///beh should show an error i guess
 	}
 
@@ -167,7 +167,7 @@ void ResourcePreloaderEditor::_paste_pressed() {
 		dialog->set_title("Error!");
 		//dialog->get_cancel()->set_text("Close");
 		dialog->get_ok()->set_text("Close");
-		dialog->popup_centered(Size2(300,60));
+		dialog->popup_centered_minsize();
 		return; ///beh should show an error i guess
 	}
 
diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp
index 96d72595a..aab371dd2 100644
--- a/tools/editor/plugins/sample_library_editor_plugin.cpp
+++ b/tools/editor/plugins/sample_library_editor_plugin.cpp
@@ -93,7 +93,7 @@ void SampleLibraryEditor::_file_load_request(const DVector<String>& p_path) {
 			dialog->set_title("Error!");
 			//dialog->get_cancel()->set_text("Close");
 			dialog->get_ok()->set_text("Close");
-			dialog->popup_centered(Size2(300,60));
+			dialog->popup_centered_minsize();
 			return; ///beh should show an error i guess
 		}
 		String basename = path.get_file().basename();
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 72b3025f2..7291b1217 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1041,7 +1041,7 @@ void ScriptEditor::_menu_option(int p_option) {
 		case WINDOW_CLOSE: {
 			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));
+				erase_tab_confirm->popup_centered_minsize();
 			} else {
 				_close_current_tab();
 			}
diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp
index 9a9e8ee61..e49999e71 100644
--- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -76,7 +76,7 @@ void SpriteFramesEditor::_file_load_request(const DVector<String>& p_path) {
 			dialog->set_title("Error!");
 			//dialog->get_cancel()->set_text("Close");
 			dialog->get_ok()->set_text("Close");
-			dialog->popup_centered(Size2(300,60));
+			dialog->popup_centered_minsize();
 			return; ///beh should show an error i guess
 		}
 
@@ -188,7 +188,7 @@ void SpriteFramesEditor::_paste_pressed() {
 		dialog->set_title("Error!");
 		//dialog->get_cancel()->set_text("Close");
 		dialog->get_ok()->set_text("Close");
-		dialog->popup_centered(Size2(300,60));
+		dialog->popup_centered_minsize();
 		return; ///beh should show an error i guess
 	}