|
@@ -1631,7 +1631,7 @@ void TextEdit::_notification(int p_what) {
|
|
|
DisplayServer::get_singleton()->window_set_ime_position(get_global_position() + cursor_pos, get_viewport()->get_window_id());
|
|
|
}
|
|
|
|
|
|
- if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD)) {
|
|
|
+ if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
|
|
|
DisplayServer::get_singleton()->virtual_keyboard_show(get_text(), get_global_rect(), true);
|
|
|
}
|
|
|
} break;
|
|
@@ -1647,7 +1647,7 @@ void TextEdit::_notification(int p_what) {
|
|
|
ime_text = "";
|
|
|
ime_selection = Point2();
|
|
|
|
|
|
- if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD)) {
|
|
|
+ if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
|
|
|
DisplayServer::get_singleton()->virtual_keyboard_hide();
|
|
|
}
|
|
|
} break;
|
|
@@ -6693,6 +6693,10 @@ void TextEdit::set_shortcut_keys_enabled(bool p_enabled) {
|
|
|
_generate_context_menu();
|
|
|
}
|
|
|
|
|
|
+void TextEdit::set_virtual_keyboard_enabled(bool p_enable) {
|
|
|
+ virtual_keyboard_enabled = p_enable;
|
|
|
+}
|
|
|
+
|
|
|
void TextEdit::set_selecting_enabled(bool p_enabled) {
|
|
|
selecting_enabled = p_enabled;
|
|
|
|
|
@@ -6711,6 +6715,10 @@ bool TextEdit::is_shortcut_keys_enabled() const {
|
|
|
return shortcut_keys_enabled;
|
|
|
}
|
|
|
|
|
|
+bool TextEdit::is_virtual_keyboard_enabled() const {
|
|
|
+ return virtual_keyboard_enabled;
|
|
|
+}
|
|
|
+
|
|
|
PopupMenu *TextEdit::get_menu() const {
|
|
|
return menu;
|
|
|
}
|
|
@@ -6763,6 +6771,8 @@ void TextEdit::_bind_methods() {
|
|
|
ClassDB::bind_method(D_METHOD("is_context_menu_enabled"), &TextEdit::is_context_menu_enabled);
|
|
|
ClassDB::bind_method(D_METHOD("set_shortcut_keys_enabled", "enable"), &TextEdit::set_shortcut_keys_enabled);
|
|
|
ClassDB::bind_method(D_METHOD("is_shortcut_keys_enabled"), &TextEdit::is_shortcut_keys_enabled);
|
|
|
+ ClassDB::bind_method(D_METHOD("set_virtual_keyboard_enabled", "enable"), &TextEdit::set_virtual_keyboard_enabled);
|
|
|
+ ClassDB::bind_method(D_METHOD("is_virtual_keyboard_enabled"), &TextEdit::is_virtual_keyboard_enabled);
|
|
|
ClassDB::bind_method(D_METHOD("set_selecting_enabled", "enable"), &TextEdit::set_selecting_enabled);
|
|
|
ClassDB::bind_method(D_METHOD("is_selecting_enabled"), &TextEdit::is_selecting_enabled);
|
|
|
|
|
@@ -6854,6 +6864,7 @@ void TextEdit::_bind_methods() {
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "override_selected_font_color"), "set_override_selected_font_color", "is_overriding_selected_font_color");
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_keys_enabled"), "set_shortcut_keys_enabled", "is_shortcut_keys_enabled");
|
|
|
+ ADD_PROPERTY(PropertyInfo(Variant::BOOL, "virtual_keyboard_enabled"), "set_virtual_keyboard_enabled", "is_virtual_keyboard_enabled");
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "selecting_enabled"), "set_selecting_enabled", "is_selecting_enabled");
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "smooth_scrolling"), "set_smooth_scroll_enable", "is_smooth_scroll_enabled");
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "v_scroll_speed"), "set_v_scroll_speed", "get_v_scroll_speed");
|