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

Fix Script Editor drawing over Dialogs.

Browse source 
Resets the z-index when focus is lost and the completion is shown.

Fixes #6769
This commit is contained in:
Andreas Haas 2016-10-10 13:21:37 +02:00
parent fea1fb0925
commit f73b501d6f
No known key found for this signature in database
GPG key ID: B5FFAE1B65FBD2E1
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/gui/text_edit.cpp
View file

@ -1245,15 +1245,19 @@ 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(get_canvas_item(), 1);
}
} break; } break;
case NOTIFICATION_FOCUS_EXIT: { case NOTIFICATION_FOCUS_EXIT: {
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(get_canvas_item(), 0);
}
} break; } break;
} }
} }
@ -4199,6 +4203,7 @@ void TextEdit::_confirm_completion() {
void TextEdit::_cancel_code_hint() { void TextEdit::_cancel_code_hint() {
VisualServer::get_singleton()->canvas_item_set_z(get_canvas_item(), 0); VisualServer::get_singleton()->canvas_item_set_z(get_canvas_item(), 0);
raised_from_completion = false;
completion_hint=""; completion_hint="";
update(); update();
} }
@ -4206,6 +4211,7 @@ void TextEdit::_cancel_code_hint() {
void TextEdit::_cancel_completion() { void TextEdit::_cancel_completion() {
VisualServer::get_singleton()->canvas_item_set_z(get_canvas_item(), 0); VisualServer::get_singleton()->canvas_item_set_z(get_canvas_item(), 0);
raised_from_completion = false;
if (!completion_active) if (!completion_active)
return; return;
@ -4386,6 +4392,7 @@ 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(get_canvas_item(), 1); VisualServer::get_singleton()->canvas_item_set_z(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();
@ -4394,6 +4401,7 @@ void TextEdit::set_code_hint(const String& p_hint) {
void TextEdit::code_complete(const Vector<String> &p_strings) { void TextEdit::code_complete(const Vector<String> &p_strings) {
VisualServer::get_singleton()->canvas_item_set_z(get_canvas_item(), 1); VisualServer::get_singleton()->canvas_item_set_z(get_canvas_item(), 1);
raised_from_completion = true;
completion_strings=p_strings; completion_strings=p_strings;
completion_active=true; completion_active=true;
completion_current=""; completion_current="";
@ -4796,6 +4804,8 @@ TextEdit::TextEdit() {
window_has_focus=true; window_has_focus=true;
select_identifiers_enabled=false; select_identifiers_enabled=false;
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

@ -244,6 +244,8 @@ class TextEdit : public Control {
bool insert_mode; bool insert_mode;
bool select_identifiers_enabled; bool select_identifiers_enabled;
bool raised_from_completion;
String hilighted_word; String hilighted_word;
uint64_t last_dblclk; uint64_t last_dblclk;