Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor "Merge From Scene" improvements #28292

Merged
merged 1 commit into from Apr 23, 2019
Merged

Minor "Merge From Scene" improvements #28292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions editor/editor_sub_scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ void EditorSubScene::_notification(int p_what) {

if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {

if (!is_visible_in_tree()) {
}
if (is_visible() && scene == NULL)
_path_browse();
}
}

Expand Down Expand Up @@ -232,7 +232,7 @@ EditorSubScene::EditorSubScene() {
hb->add_child(path);
path->set_h_size_flags(SIZE_EXPAND_FILL);
Button *b = memnew(Button);
b->set_text(" .. ");
b->set_text(TTR("Browse"));
hb->add_child(b);
b->connect("pressed", this, "_path_browse");
vb->add_margin_child(TTR("Scene Path:"), hb);
Expand Down
8 changes: 7 additions & 1 deletion editor/scene_tree_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,7 +1942,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() {
Expand Down