godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86804 from ryevdokimov/allow-all-modes-to-select 

Allow all editor modes to select nodes in the viewport
This commit is contained in:
Rémi Verschelde 2024-01-08 11:56:19 +01:00
parent c10d268974 ff03a32323
commit f46465ba14
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -2014,14 +2014,14 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) {
if ((b->is_alt_pressed() && !b->is_command_or_control_pressed()) || tool == TOOL_MOVE) { if ((b->is_alt_pressed() && !b->is_command_or_control_pressed()) || tool == TOOL_MOVE) {
List<CanvasItem *> selection = _get_edited_canvas_items(); List<CanvasItem *> selection = _get_edited_canvas_items();
drag_selection.clear();
for (int i = 0; i < selection.size(); i++) {
if (_is_node_movable(selection[i], true)) {
drag_selection.push_back(selection[i]);
}
}
if (selection.size() > 0) { if (selection.size() > 0) {
drag_selection.clear();
for (int i = 0; i < selection.size(); i++) {
if (_is_node_movable(selection[i], true)) {
drag_selection.push_back(selection[i]);
}
}
drag_type = DRAG_MOVE; drag_type = DRAG_MOVE;
CanvasItem *ci = selection[0]; CanvasItem *ci = selection[0];
@ -2043,8 +2043,9 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) {
drag_from = transform.affine_inverse().xform(b->get_position()); drag_from = transform.affine_inverse().xform(b->get_position());
_save_canvas_item_state(drag_selection); _save_canvas_item_state(drag_selection);
return true;
} }
return true;
} }
} }
} }
@ -2344,7 +2345,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
return true; return true;
} }
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && tool == TOOL_SELECT && !panner->is_panning()) { if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && !panner->is_panning() && (tool == TOOL_SELECT || tool == TOOL_MOVE || tool == TOOL_SCALE || tool == TOOL_ROTATE)) {
// Single item selection // Single item selection
Point2 click = transform.affine_inverse().xform(b->get_position()); Point2 click = transform.affine_inverse().xform(b->get_position());
@ -2379,7 +2380,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
} else { } else {
bool still_selected = _select_click_on_item(ci, click, b->is_shift_pressed()); bool still_selected = _select_click_on_item(ci, click, b->is_shift_pressed());
// Start dragging // Start dragging
if (still_selected) { if (still_selected && (tool == TOOL_SELECT || tool == TOOL_MOVE)) {
// Drag the node(s) if requested // Drag the node(s) if requested
drag_start_origin = click; drag_start_origin = click;
drag_type = DRAG_QUEUED; drag_type = DRAG_QUEUED;

6
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -1839,17 +1839,17 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
clicked = ObjectID(); clicked = ObjectID();
if ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE) { if (can_select_gizmos && ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)) {
begin_transform(TRANSFORM_ROTATE, false); begin_transform(TRANSFORM_ROTATE, false);
break; break;
} }
if (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE) { if (can_select_gizmos && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE) {
begin_transform(TRANSFORM_TRANSLATE, false); begin_transform(TRANSFORM_TRANSLATE, false);
break; break;
} }
if (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SCALE) { if (can_select_gizmos && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SCALE) {
begin_transform(TRANSFORM_SCALE, false); begin_transform(TRANSFORM_SCALE, false);
break; break;
} }