|
@@ -1068,8 +1068,11 @@ void LineEdit::_notification(int p_what) {
|
|
|
if (has_focus()) {
|
|
|
if (get_viewport()->get_window_id() != DisplayServer::INVALID_WINDOW_ID && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
|
|
|
DisplayServer::get_singleton()->window_set_ime_active(true, get_viewport()->get_window_id());
|
|
|
- Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
|
|
|
- DisplayServer::get_singleton()->window_set_ime_position(get_global_position() + pos, get_viewport()->get_window_id());
|
|
|
+ Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2) + get_global_position();
|
|
|
+ if (get_window()->get_embedder()) {
|
|
|
+ pos += get_viewport()->get_popup_base_transform().get_origin();
|
|
|
+ }
|
|
|
+ DisplayServer::get_singleton()->window_set_ime_position(pos, get_viewport()->get_window_id());
|
|
|
}
|
|
|
}
|
|
|
} break;
|
|
@@ -1088,8 +1091,11 @@ void LineEdit::_notification(int p_what) {
|
|
|
|
|
|
if (get_viewport()->get_window_id() != DisplayServer::INVALID_WINDOW_ID && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
|
|
|
DisplayServer::get_singleton()->window_set_ime_active(true, get_viewport()->get_window_id());
|
|
|
- Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
|
|
|
- DisplayServer::get_singleton()->window_set_ime_position(get_global_position() + pos, get_viewport()->get_window_id());
|
|
|
+ Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2) + get_global_position();
|
|
|
+ if (get_window()->get_embedder()) {
|
|
|
+ pos += get_viewport()->get_popup_base_transform().get_origin();
|
|
|
+ }
|
|
|
+ DisplayServer::get_singleton()->window_set_ime_position(pos, get_viewport()->get_window_id());
|
|
|
}
|
|
|
|
|
|
show_virtual_keyboard();
|