godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Merge pull request #28292 from homer666/merge-from-scene-stuff

Browse Source 
Minor "Merge From Scene" improvements
This commit is contained in:
Rémi Verschelde
2019-04-23 12:08:55 +02:00
committed by GitHub
parent b874b33a32 36f955e4f3
commit 04efa59868
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/scene_tree_dock.cpp
View File

@@ -1940,7 +1940,13 @@ void SceneTreeDock::set_selected(Node *p_node, bool p_emit_selected) {
void SceneTreeDock::import_subscene() {
import_subscene_dialog->popup_centered_ratio();
Size2 popup_size = Size2(500, 800) * editor_get_scale();
Size2 window_size = get_viewport_rect().size;
popup_size.x = MIN(window_size.x * 0.8, popup_size.x);
popup_size.y = MIN(window_size.y * 0.8, popup_size.y);
import_subscene_dialog->popup_centered(popup_size);
}
void SceneTreeDock::_import_subscene() {