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

Remove no longer necessary "raise_from_completion" in TextEdit

Browse source 
This is no longer needed to fix #1257 because the code-autocomplete hint stops
at the script editor’s edge now.
And #6690 will not arise because it is just caused by "raise_from_completion".

Fixes #22504 and fixes #16064.
This commit is contained in:
zhagsenkk 2018-10-21 14:48:41 +08:00 committed by Rémi Verschelde
parent 970b58148f
commit 67ba4dc8cd
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/gui/text_edit.cpp
View file

@ -1429,9 +1429,6 @@ void TextEdit::_notification(int p_what) {
if (OS::get_singleton()->has_virtual_keyboard()) if (OS::get_singleton()->has_virtual_keyboard())
OS::get_singleton()->show_virtual_keyboard(get_text(), get_global_rect()); OS::get_singleton()->show_virtual_keyboard(get_text(), get_global_rect());
if (raised_from_completion) {
VisualServer::get_singleton()->canvas_item_set_z_index(get_canvas_item(), 1);
}
} break; } break;
case NOTIFICATION_FOCUS_EXIT: { case NOTIFICATION_FOCUS_EXIT: {
@ -1443,9 +1440,6 @@ void TextEdit::_notification(int p_what) {
if (OS::get_singleton()->has_virtual_keyboard()) if (OS::get_singleton()->has_virtual_keyboard())
OS::get_singleton()->hide_virtual_keyboard(); OS::get_singleton()->hide_virtual_keyboard();
if (raised_from_completion) {
VisualServer::get_singleton()->canvas_item_set_z_index(get_canvas_item(), 0);
}
} break; } break;
} }
} }
@ -5666,16 +5660,12 @@ void TextEdit::_confirm_completion() {
void TextEdit::_cancel_code_hint() { void TextEdit::_cancel_code_hint() {
VisualServer::get_singleton()->canvas_item_set_z_index(get_canvas_item(), 0);
raised_from_completion = false;
completion_hint = ""; completion_hint = "";
update(); update();
} }
void TextEdit::_cancel_completion() { void TextEdit::_cancel_completion() {
VisualServer::get_singleton()->canvas_item_set_z_index(get_canvas_item(), 0);
raised_from_completion = false;
if (!completion_active) if (!completion_active)
return; return;
@ -5833,8 +5823,6 @@ void TextEdit::query_code_comple() {
void TextEdit::set_code_hint(const String &p_hint) { void TextEdit::set_code_hint(const String &p_hint) {
VisualServer::get_singleton()->canvas_item_set_z_index(get_canvas_item(), 1);
raised_from_completion = true;
completion_hint = p_hint; completion_hint = p_hint;
completion_hint_offset = -0xFFFF; completion_hint_offset = -0xFFFF;
update(); update();
@ -5842,8 +5830,6 @@ void TextEdit::set_code_hint(const String &p_hint) {
void TextEdit::code_complete(const Vector<String> &p_strings, bool p_forced) { void TextEdit::code_complete(const Vector<String> &p_strings, bool p_forced) {
VisualServer::get_singleton()->canvas_item_set_z_index(get_canvas_item(), 1);
raised_from_completion = true;
completion_strings = p_strings; completion_strings = p_strings;
completion_active = true; completion_active = true;
completion_forced = p_forced; completion_forced = p_forced;
@ -6346,8 +6332,6 @@ TextEdit::TextEdit() {
target_v_scroll = 0; target_v_scroll = 0;
v_scroll_speed = 80; v_scroll_speed = 80;
raised_from_completion = false;
context_menu_enabled = true; context_menu_enabled = true;
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);

2
scene/gui/text_edit.h
View file

@ -306,8 +306,6 @@ private:
float target_v_scroll; float target_v_scroll;
float v_scroll_speed; float v_scroll_speed;
bool raised_from_completion;
String highlighted_word; String highlighted_word;
uint64_t last_dblclk; uint64_t last_dblclk;