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

Update usabilaty of the CustomPropertyEditor

Browse source 
Structure button layout so there is no more overlap.
This commit is contained in:
David Cambré 2021-08-29 13:08:02 +02:00
parent a0588685bb
commit c977adbd3b
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
editor/property_editor.cpp
View file

@ -1671,7 +1671,7 @@ void CustomPropertyEditor::_focus_exit() {
} }
void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) { void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) {
Ref<StyleBox> sb = action_buttons[0]->get_theme_stylebox(SNAME("panel")); Ref<StyleBox> sb = action_buttons[0]->get_theme_stylebox(SNAME("button"));
int margin_top = sb->get_margin(SIDE_TOP); int margin_top = sb->get_margin(SIDE_TOP);
int margin_left = sb->get_margin(SIDE_LEFT); int margin_left = sb->get_margin(SIDE_LEFT);
int margin_bottom = sb->get_margin(SIDE_BOTTOM); int margin_bottom = sb->get_margin(SIDE_BOTTOM);
@ -1804,26 +1804,18 @@ CustomPropertyEditor::CustomPropertyEditor() {
} }
text_edit = memnew(TextEdit); text_edit = memnew(TextEdit);
add_child(text_edit); value_vbox->add_child(text_edit);
text_edit->set_anchors_and_offsets_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 5); text_edit->set_anchors_and_offsets_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 5);
text_edit->set_v_size_flags(Control::SIZE_EXPAND_FILL);
text_edit->set_offset(SIDE_BOTTOM, -30); text_edit->set_offset(SIDE_BOTTOM, -30);
text_edit->hide(); text_edit->hide();
text_edit->connect("text_changed", callable_mp(this, &CustomPropertyEditor::_text_edit_changed)); text_edit->connect("text_changed", callable_mp(this, &CustomPropertyEditor::_text_edit_changed));
for (int i = 0; i < MAX_ACTION_BUTTONS; i++) {
action_buttons[i] = memnew(Button);
action_buttons[i]->hide();
add_child(action_buttons[i]);
Vector<Variant> binds;
binds.push_back(i);
action_buttons[i]->connect("pressed", callable_mp(this, &CustomPropertyEditor::_action_pressed), binds);
}
color_picker = nullptr; color_picker = nullptr;
file = memnew(EditorFileDialog); file = memnew(EditorFileDialog);
add_child(file); value_vbox->add_child(file);
file->hide(); file->hide();
file->connect("file_selected", callable_mp(this, &CustomPropertyEditor::_file_selected)); file->connect("file_selected", callable_mp(this, &CustomPropertyEditor::_file_selected));
@ -1831,46 +1823,58 @@ CustomPropertyEditor::CustomPropertyEditor() {
error = memnew(ConfirmationDialog); error = memnew(ConfirmationDialog);
error->set_title(TTR("Error!")); error->set_title(TTR("Error!"));
add_child(error); value_vbox->add_child(error);
scene_tree = memnew(SceneTreeDialog); scene_tree = memnew(SceneTreeDialog);
add_child(scene_tree); value_vbox->add_child(scene_tree);
scene_tree->connect("selected", callable_mp(this, &CustomPropertyEditor::_node_path_selected)); scene_tree->connect("selected", callable_mp(this, &CustomPropertyEditor::_node_path_selected));
scene_tree->get_scene_tree()->set_show_enabled_subscene(true); scene_tree->get_scene_tree()->set_show_enabled_subscene(true);
texture_preview = memnew(TextureRect); texture_preview = memnew(TextureRect);
add_child(texture_preview); value_vbox->add_child(texture_preview);
texture_preview->hide(); texture_preview->hide();
easing_draw = memnew(Control); easing_draw = memnew(Control);
add_child(easing_draw); value_vbox->add_child(easing_draw);
easing_draw->hide(); easing_draw->hide();
easing_draw->connect("draw", callable_mp(this, &CustomPropertyEditor::_draw_easing)); easing_draw->connect("draw", callable_mp(this, &CustomPropertyEditor::_draw_easing));
easing_draw->connect("gui_input", callable_mp(this, &CustomPropertyEditor::_drag_easing)); easing_draw->connect("gui_input", callable_mp(this, &CustomPropertyEditor::_drag_easing));
easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE); easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE);
type_button = memnew(MenuButton); type_button = memnew(MenuButton);
add_child(type_button); value_vbox->add_child(type_button);
type_button->hide(); type_button->hide();
type_button->get_popup()->connect("id_pressed", callable_mp(this, &CustomPropertyEditor::_type_create_selected)); type_button->get_popup()->connect("id_pressed", callable_mp(this, &CustomPropertyEditor::_type_create_selected));
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
// menu->set_pass_on_modal_close_click(false); // menu->set_pass_on_modal_close_click(false);
add_child(menu); value_vbox->add_child(menu);
menu->connect("id_pressed", callable_mp(this, &CustomPropertyEditor::_menu_option)); menu->connect("id_pressed", callable_mp(this, &CustomPropertyEditor::_menu_option));
evaluator = nullptr; evaluator = nullptr;
spinbox = memnew(SpinBox); spinbox = memnew(SpinBox);
add_child(spinbox); value_vbox->add_child(spinbox);
spinbox->set_anchors_and_offsets_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 5); spinbox->set_anchors_and_offsets_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 5);
spinbox->connect("value_changed", callable_mp(this, &CustomPropertyEditor::_range_modified)); spinbox->connect("value_changed", callable_mp(this, &CustomPropertyEditor::_range_modified));
slider = memnew(HSlider); slider = memnew(HSlider);
add_child(slider); value_vbox->add_child(slider);
slider->set_anchors_and_offsets_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 5); slider->set_anchors_and_offsets_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 5);
slider->connect("value_changed", callable_mp(this, &CustomPropertyEditor::_range_modified)); slider->connect("value_changed", callable_mp(this, &CustomPropertyEditor::_range_modified));
action_hboxes = memnew(HBoxContainer);
action_hboxes->set_alignment(BoxContainer::ALIGN_CENTER);
value_vbox->add_child(action_hboxes);
for (int i = 0; i < MAX_ACTION_BUTTONS; i++) {
action_buttons[i] = memnew(Button);
action_buttons[i]->hide();
action_hboxes->add_child(action_buttons[i]);
Vector<Variant> binds;
binds.push_back(i);
action_buttons[i]->connect("pressed", callable_mp(this, &CustomPropertyEditor::_action_pressed), binds);
}
create_dialog = nullptr; create_dialog = nullptr;
property_select = nullptr; property_select = nullptr;
} }

1
editor/property_editor.h
View file

@ -110,6 +110,7 @@ class CustomPropertyEditor : public PopupPanel {
int focused_value_editor; int focused_value_editor;
Label *value_label[MAX_VALUE_EDITORS]; Label *value_label[MAX_VALUE_EDITORS];
HScrollBar *scroll[4]; HScrollBar *scroll[4];
HBoxContainer *action_hboxes;
Button *action_buttons[MAX_ACTION_BUTTONS]; Button *action_buttons[MAX_ACTION_BUTTONS];
MenuButton *type_button; MenuButton *type_button;
Vector<String> inheritors_array; Vector<String> inheritors_array;