godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #97807 from syntaxerror247/colorPicker_kb_fix 

Fix `ColorPicker` virtual keyboard popup on mobile
This commit is contained in:
Thaddeus Crews 2024-10-21 16:39:06 -05:00
parent 5fb22327ee 8f9ed35f8b
commit 29fa4b18f1
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/color_picker.cpp
View File

@ -245,21 +245,7 @@ void ColorPicker::finish_shaders() {
} }
void ColorPicker::set_focus_on_line_edit() { void ColorPicker::set_focus_on_line_edit() {
bool has_hardware_keyboard = true;
#if defined(ANDROID_ENABLED) || defined(IOS_ENABLED)
has_hardware_keyboard = DisplayServer::get_singleton()->has_hardware_keyboard();
#endif // ANDROID_ENABLED || IOS_ENABLED
if (has_hardware_keyboard) {
callable_mp((Control *)c_text, &Control::grab_focus).call_deferred(); callable_mp((Control *)c_text, &Control::grab_focus).call_deferred();
} else {
// A hack to avoid showing the virtual keyboard when the ColorPicker window popups and
// no hardware keyboard is detected on Android and IOS.
// This will only focus the LineEdit without editing, the virtual keyboard will only be visible when
// we touch the LineEdit to enter edit mode.
callable_mp(c_text, &LineEdit::set_editable).call_deferred(false);
callable_mp((Control *)c_text, &Control::grab_focus).call_deferred();
callable_mp(c_text, &LineEdit::set_editable).call_deferred(true);
}
} }
void ColorPicker::_update_controls() { void ColorPicker::_update_controls() {
@ -2103,8 +2089,10 @@ void ColorPickerButton::pressed() {
float v_offset = show_above ? -minsize.y : get_size().y; float v_offset = show_above ? -minsize.y : get_size().y;
popup->set_position(get_screen_position() + Vector2(h_offset, v_offset)); popup->set_position(get_screen_position() + Vector2(h_offset, v_offset));
popup->popup(); popup->popup();
if (DisplayServer::get_singleton()->has_hardware_keyboard()) {
picker->set_focus_on_line_edit(); picker->set_focus_on_line_edit();
} }
}
void ColorPickerButton::_notification(int p_what) { void ColorPickerButton::_notification(int p_what) {
switch (p_what) { switch (p_what) {