diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_run.cpp | 9 | ||||
| -rw-r--r-- | editor/property_editor.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_editor.cpp | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 90cbabcc4f..09bfa0aff0 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -101,7 +101,14 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li args.push_back(itos(screen_rect.position.x) + "," + itos(screen_rect.position.y)); } break; case 1: { // centered - Vector2 pos = screen_rect.position + ((screen_rect.size - desired_size) / 2).floor(); + int display_scale = 1; +#ifdef OSX_ENABLED + if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).x > 2000) { + display_scale = 2; + } +#endif + + Vector2 pos = screen_rect.position + ((screen_rect.size / display_scale - desired_size) / 2).floor(); args.push_back("--position"); args.push_back(itos(pos.x) + "," + itos(pos.y)); } break; diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index b3743dbdf8..b187a9ae9d 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -70,7 +70,7 @@ void EditorResourceConversionPlugin::_bind_methods() { mi.name = "_handles"; mi.return_val = PropertyInfo(Variant::BOOL, ""); - BIND_VMETHOD(MethodInfo(Variant::BOOL, "_converts_to")); + BIND_VMETHOD(MethodInfo(Variant::STRING, "_converts_to")); } String EditorResourceConversionPlugin::converts_to() const { diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index 2c0981ca30..25924212fd 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -484,7 +484,8 @@ void SceneTreeEditor::_selected_changed() { void SceneTreeEditor::_deselect_items() { // Clear currently elected items in scene tree dock. - editor_selection->clear(); + if (editor_selection) + editor_selection->clear(); } void SceneTreeEditor::_cell_multi_selected(Object *p_object, int p_cell, bool p_selected) { |