asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #32447 from YeldhamDev/tree_drag_center_icon

Browse source 
Minor visual adjustment in drag preview of the scene and file tree editors
This commit is contained in:
Rémi Verschelde 2019-09-30 19:39:02 +02:00 committed by GitHub
commit c11ccb7e6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/editor_node.cpp
View file

@ -4891,7 +4891,7 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String> &p_paths, Control *
} }
int max_rows = 6; int max_rows = 6;
int num_rows = p_paths.size() > max_rows ? max_rows - 1 : p_paths.size(); //Don't waste a row to say "1 more file" - list it instead. int num_rows = p_paths.size() > max_rows ? max_rows - 1 : p_paths.size(); // Don't waste a row to say "1 more file" - list it instead.
VBoxContainer *vbox = memnew(VBoxContainer); VBoxContainer *vbox = memnew(VBoxContainer);
for (int i = 0; i < num_rows; i++) { for (int i = 0; i < num_rows; i++) {
HBoxContainer *hbox = memnew(HBoxContainer); HBoxContainer *hbox = memnew(HBoxContainer);
@ -4905,6 +4905,7 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String> &p_paths, Control *
label->set_text(p_paths[i].get_file()); label->set_text(p_paths[i].get_file());
icon->set_texture(gui_base->get_icon("File", "EditorIcons")); icon->set_texture(gui_base->get_icon("File", "EditorIcons"));
} }
icon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
icon->set_size(Size2(16, 16)); icon->set_size(Size2(16, 16));
hbox->add_child(icon); hbox->add_child(icon);
hbox->add_child(label); hbox->add_child(label);

1
editor/scene_tree_editor.cpp
View file

@ -959,6 +959,7 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
HBoxContainer *hb = memnew(HBoxContainer); HBoxContainer *hb = memnew(HBoxContainer);
TextureRect *tf = memnew(TextureRect); TextureRect *tf = memnew(TextureRect);
tf->set_texture(icons[i]); tf->set_texture(icons[i]);
tf->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
hb->add_child(tf); hb->add_child(tf);
Label *label = memnew(Label(selected[i]->get_name())); Label *label = memnew(Label(selected[i]->get_name()));
hb->add_child(label); hb->add_child(label);