asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59827 from ConteZero/fix_right_menu

Browse source
This commit is contained in:
Rémi Verschelde 2022-04-14 21:29:57 +02:00 committed by GitHub
commit 8182a754d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/line_edit.cpp
View file

@ -53,6 +53,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
if (b.is_valid()) {
if (b->is_pressed() && b->get_button_index() == BUTTON_RIGHT && context_menu_enabled) {
popup_show = true;
if (editable) {
menu->set_item_disabled(menu->get_item_index(MENU_UNDO), !has_undo());
menu->set_item_disabled(menu->get_item_index(MENU_REDO), !has_redo());
@ -62,7 +63,6 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
menu->set_size(Vector2(1, 1));
menu->set_scale(get_global_transform().get_scale());
menu->popup();
grab_focus();
accept_event();
return;
}
@ -608,6 +608,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
} break;
case KEY_MENU: {
if (context_menu_enabled) {
popup_show = true;
if (editable) {
menu->set_item_disabled(menu->get_item_index(MENU_UNDO), !has_undo());
menu->set_item_disabled(menu->get_item_index(MENU_REDO), !has_redo());
@ -1040,9 +1041,10 @@ void LineEdit::_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()) {

1
scene/gui/line_edit.h
View file

@ -76,6 +76,7 @@ private:
bool selecting_enabled;
bool deselect_on_focus_loss_enabled;
bool popup_show = false;
bool context_menu_enabled;
PopupMenu *menu;

6
scene/gui/text_edit.cpp
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());

1
scene/gui/text_edit.h
View file

@ -438,6 +438,7 @@ private:
bool selecting_enabled;
bool deselect_on_focus_loss_enabled;
bool popup_show = false;
bool context_menu_enabled;
bool shortcut_keys_enabled;