Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-12 13:51:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported:

Browse Source 
Fix Right-Click clearing selection - ConteZero
57b616fb21
This commit is contained in:
Relintai 2022-07-25 19:55:26 +02:00
parent d85caf2c71
commit c8adff0f99
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/line_edit.cpp
View File

@ -54,6 +54,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());
@ -63,7 +64,7 @@ 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;
}
@ -570,6 +571,8 @@ 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());
@ -980,10 +983,11 @@ 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()) {
@ -1983,6 +1987,7 @@ LineEdit::LineEdit() {
shortcut_keys_enabled = true;
selecting_enabled = true;
deselect_on_focus_loss_enabled = true;
popup_show = false;
undo_stack_pos = nullptr;
_create_undo_state();

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;
bool context_menu_enabled;
PopupMenu *menu;

9
scene/gui/text_edit.cpp
View File

@ -1890,9 +1890,11 @@ 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()) {
@ -2592,6 +2594,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());
@ -2601,7 +2604,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) {
@ -3878,6 +3880,8 @@ 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());
@ -7558,6 +7562,7 @@ TextEdit::TextEdit() {
selecting_enabled = true;
deselect_on_focus_loss_enabled = true;
popup_show = false;
context_menu_enabled = true;
shortcut_keys_enabled = true;
menu = memnew(PopupMenu);

1
scene/gui/text_edit.h
View File

@ -435,6 +435,7 @@ private:
bool selecting_enabled;
bool deselect_on_focus_loss_enabled;
bool popup_show;
bool context_menu_enabled;
bool shortcut_keys_enabled;