|
@@ -783,11 +783,15 @@ void CanvasItemEditor::_find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_n
|
|
|
|
|
|
bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append) {
|
|
|
bool still_selected = true;
|
|
|
- if (p_append) {
|
|
|
+ if (p_append && !editor_selection->get_selected_node_list().empty()) {
|
|
|
if (editor_selection->is_selected(item)) {
|
|
|
// Already in the selection, remove it from the selected nodes
|
|
|
editor_selection->remove_node(item);
|
|
|
still_selected = false;
|
|
|
+
|
|
|
+ if (editor_selection->get_selected_node_list().size() == 1) {
|
|
|
+ editor->push_item(editor_selection->get_selected_node_list()[0]);
|
|
|
+ }
|
|
|
} else {
|
|
|
// Add the item to the selection
|
|
|
editor_selection->add_node(item);
|
|
@@ -2440,6 +2444,9 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
|
|
|
SWAP(bsfrom.y, bsto.y);
|
|
|
|
|
|
_find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems);
|
|
|
+ if (selitems.size() == 1 && editor_selection->get_selected_node_list().empty()) {
|
|
|
+ editor->push_item(selitems[0]);
|
|
|
+ }
|
|
|
for (List<CanvasItem *>::Element *E = selitems.front(); E; E = E->next()) {
|
|
|
editor_selection->add_node(E->get());
|
|
|
}
|