diff options
Diffstat (limited to 'editor/plugins')
5 files changed, 16 insertions, 22 deletions
diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index 9c5783ff7d..3029ad978a 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -94,7 +94,7 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven menu->add_item(TTR("Paste"), MENU_PASTE); } menu->add_separator(); - menu->add_item(TTR("Load.."), MENU_LOAD_FILE); + menu->add_item(TTR("Load..."), MENU_LOAD_FILE); menu->set_global_position(blend_space_draw->get_global_transform().xform(mb->get_position())); menu->popup(); diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 14537a7549..664e3e8b7f 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -113,7 +113,7 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven menu->add_item(TTR("Paste"), MENU_PASTE); } menu->add_separator(); - menu->add_item(TTR("Load.."), MENU_LOAD_FILE); + menu->add_item(TTR("Load..."), MENU_LOAD_FILE); menu->set_global_position(blend_space_draw->get_global_transform().xform(mb->get_position())); menu->popup(); diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index a5b730dffd..62eac05cb7 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -79,7 +79,7 @@ void AnimationNodeBlendTreeEditor::_update_options_menu() { add_node->get_popup()->add_item(TTR("Paste"), MENU_PASTE); } add_node->get_popup()->add_separator(); - add_node->get_popup()->add_item(TTR("Load.."), MENU_LOAD_FILE); + add_node->get_popup()->add_item(TTR("Load..."), MENU_LOAD_FILE); } Size2 AnimationNodeBlendTreeEditor::get_minimum_size() const { @@ -866,7 +866,7 @@ AnimationNodeBlendTreeEditor::AnimationNodeBlendTreeEditor() { add_node = memnew(MenuButton); graph->get_zoom_hbox()->add_child(add_node); - add_node->set_text(TTR("Add Node..")); + add_node->set_text(TTR("Add Node...")); graph->get_zoom_hbox()->move_child(add_node, 0); add_node->get_popup()->connect("id_pressed", this, "_add_node"); add_node->connect("about_to_show", this, "_update_options_menu"); diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index 2a2f3ee635..3741e79ef0 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -606,7 +606,7 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() { state_machine->get_node_list(&nodes); node_rects.clear(); - Rect2 scroll_range(Point2(), state_machine_draw->get_size()); + Rect2 scroll_range; //snap lines if (dragging_selected) { @@ -823,7 +823,8 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() { } } - scroll_range = scroll_range.grow(200 * EDSCALE); + scroll_range.position -= state_machine_draw->get_size(); + scroll_range.size += state_machine_draw->get_size() * 2.0; //adjust scrollbars updating = true; @@ -1307,17 +1308,13 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { play_mode = memnew(OptionButton); top_hb->add_child(play_mode); - GridContainer *main_grid = memnew(GridContainer); - main_grid->set_columns(2); - add_child(main_grid); - main_grid->set_v_size_flags(SIZE_EXPAND_FILL); - panel = memnew(PanelContainer); panel->set_clip_contents(true); - main_grid->add_child(panel); - panel->set_h_size_flags(SIZE_EXPAND_FILL); + add_child(panel); + panel->set_v_size_flags(SIZE_EXPAND_FILL); state_machine_draw = memnew(Control); + panel->add_child(state_machine_draw); state_machine_draw->connect("gui_input", this, "_state_machine_gui_input"); state_machine_draw->connect("draw", this, "_state_machine_draw"); state_machine_draw->set_focus_mode(FOCUS_ALL); @@ -1328,24 +1325,21 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { state_machine_play_pos->set_anchors_and_margins_preset(PRESET_WIDE); state_machine_play_pos->connect("draw", this, "_state_machine_pos_draw"); - panel->add_child(state_machine_draw); - panel->set_v_size_flags(SIZE_EXPAND_FILL); - v_scroll = memnew(VScrollBar); - main_grid->add_child(v_scroll); + state_machine_draw->add_child(v_scroll); + v_scroll->set_anchors_and_margins_preset(PRESET_RIGHT_WIDE); v_scroll->connect("value_changed", this, "_scroll_changed"); h_scroll = memnew(HScrollBar); - main_grid->add_child(h_scroll); + state_machine_draw->add_child(h_scroll); + h_scroll->set_anchors_and_margins_preset(PRESET_BOTTOM_WIDE); + h_scroll->set_margin(MARGIN_RIGHT, -v_scroll->get_size().x * EDSCALE); h_scroll->connect("value_changed", this, "_scroll_changed"); - main_grid->add_child(memnew(Control)); //empty bottom right - error_panel = memnew(PanelContainer); add_child(error_panel); error_label = memnew(Label); error_panel->add_child(error_label); - error_label->set_text("eh"); undo_redo = EditorNode::get_singleton()->get_undo_redo(); diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index 34ef1ffd3e..a19e715d87 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -206,7 +206,7 @@ void EditorPropertyRootMotion::update_property() { assign->set_tooltip(p); if (p == NodePath()) { assign->set_icon(Ref<Texture>()); - assign->set_text(TTR("Assign..")); + assign->set_text(TTR("Assign...")); assign->set_flat(false); return; } |