Fix Right-Click clearing selection

This commit is contained in:
ConteZero
2022-04-03 10:07:02 +02:00
parent 99c07c92eb
commit 57b616fb21
4 changed files with 10 additions and 4 deletions

View File

@@ -1897,9 +1897,10 @@ void TextEdit::_notification(int p_what) {
OS::get_singleton()->hide_virtual_keyboard();
}
if (deselect_on_focus_loss_enabled) {
if (deselect_on_focus_loss_enabled && !popup_show) {
deselect();
}
popup_show = false;
} break;
case MainLoop::NOTIFICATION_OS_IME_UPDATE: {
if (has_focus()) {
@@ -2652,6 +2653,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
}
}
popup_show = true;
if (!readonly) {
menu->set_item_disabled(menu->get_item_index(MENU_UNDO), !has_undo());
menu->set_item_disabled(menu->get_item_index(MENU_REDO), !has_redo());
@@ -2661,7 +2663,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
menu->set_size(Vector2(1, 1));
menu->set_scale(get_global_transform().get_scale());
menu->popup();
grab_focus();
}
} else {
if (mb->get_button_index() == BUTTON_LEFT) {
@@ -3963,6 +3964,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
case KEY_MENU: {
if (context_menu_enabled) {
popup_show = true;
if (!readonly) {
menu->set_item_disabled(menu->get_item_index(MENU_UNDO), !has_undo());
menu->set_item_disabled(menu->get_item_index(MENU_REDO), !has_redo());