|
@@ -896,15 +896,16 @@ void CanvasItemEditor::_snap_changed() {
|
|
}
|
|
}
|
|
|
|
|
|
void CanvasItemEditor::_selection_result_pressed(int p_result) {
|
|
void CanvasItemEditor::_selection_result_pressed(int p_result) {
|
|
- if (selection_results.size() <= p_result) {
|
|
|
|
|
|
+ if (selection_results_menu.size() <= p_result) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- CanvasItem *item = selection_results[p_result].item;
|
|
|
|
|
|
+ CanvasItem *item = selection_results_menu[p_result].item;
|
|
|
|
|
|
if (item) {
|
|
if (item) {
|
|
_select_click_on_item(item, Point2(), selection_menu_additive_selection);
|
|
_select_click_on_item(item, Point2(), selection_menu_additive_selection);
|
|
}
|
|
}
|
|
|
|
+ selection_results_menu.clear();
|
|
}
|
|
}
|
|
|
|
|
|
void CanvasItemEditor::_selection_menu_hide() {
|
|
void CanvasItemEditor::_selection_menu_hide() {
|
|
@@ -2247,6 +2248,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
|
|
selection_menu->set_item_tooltip(i, String(item->get_name()) + "\nType: " + item->get_class() + "\nPath: " + node_path);
|
|
selection_menu->set_item_tooltip(i, String(item->get_name()) + "\nType: " + item->get_class() + "\nPath: " + node_path);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ selection_results_menu = selection_results;
|
|
selection_menu_additive_selection = b->is_shift_pressed();
|
|
selection_menu_additive_selection = b->is_shift_pressed();
|
|
selection_menu->set_position(viewport->get_screen_transform().xform(b->get_position()));
|
|
selection_menu->set_position(viewport->get_screen_transform().xform(b->get_position()));
|
|
selection_menu->reset_size();
|
|
selection_menu->reset_size();
|