GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

ui: soft input callback to separate function

Browse source
This commit is contained in:
ardocrat 2024-05-18 22:50:08 +03:00
parent 42146f0d68
commit e7f808e5bc
1 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/gui/views/views.rs
View file

@ -17,7 +17,7 @@ use std::sync::Arc;
use parking_lot::RwLock; use parking_lot::RwLock;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use egui::{Align, Button, CursorIcon, Layout, lerp, PointerState, Rect, Response, Rgba, RichText, Sense, Spinner, TextBuffer, TextStyle, Widget}; use egui::{Align, Button, CursorIcon, Id, Layout, lerp, PointerState, Rect, Response, Rgba, RichText, Sense, Spinner, TextBuffer, TextStyle, Ui, Widget};
use egui::epaint::{Color32, FontId, RectShape, Rounding, Stroke}; use egui::epaint::{Color32, FontId, RectShape, Rounding, Stroke};
use egui::epaint::text::TextWrapping; use egui::epaint::text::TextWrapping;
use egui::os::OperatingSystem; use egui::os::OperatingSystem;
@ -402,43 +402,51 @@ impl View {
text_edit_resp.request_focus(); text_edit_resp.request_focus();
cb.show_keyboard(); cb.show_keyboard();
} }
// Apply text from input on Android as temporary fix for egui. // Apply text from input on Android as temporary fix for egui.
let os = OperatingSystem::from_target_os(); if text_edit_resp.has_focus() {
if os == OperatingSystem::Android && text_edit_resp.has_focus() { Self::on_soft_input(ui, options.id, value);
let mut w_input = LAST_SOFT_KEYBOARD_INPUT.write();
if !w_input.is_empty() {
let mut state = TextEditState::load(ui.ctx(), options.id).unwrap();
match state.cursor.char_range() {
None => {}
Some(range) => {
let mut r = range.clone();
let mut index = r.primary.index;
value.insert_text(w_input.as_str(), index);
index = index + 1;
if index == 0 {
r.primary.index = value.len();
r.secondary.index = r.primary.index;
} else {
r.primary.index = index;
r.secondary.index = r.primary.index;
}
state.cursor.set_char_range(Some(r));
TextEditState::store(state, ui.ctx(), options.id);
}
}
}
*w_input = "".to_string();
ui.ctx().request_repaint();
} }
}); });
}); });
} }
/// Apply soft keyboard input data to provided String.
pub fn on_soft_input(ui: &mut Ui, id: Id, value: &mut String) {
let os = OperatingSystem::from_target_os();
if os == OperatingSystem::Android {
let mut w_input = LAST_SOFT_KEYBOARD_INPUT.write();
if !w_input.is_empty() {
let mut state = TextEditState::load(ui.ctx(), id).unwrap();
match state.cursor.char_range() {
None => {}
Some(range) => {
let mut r = range.clone();
let mut index = r.primary.index;
value.insert_text(w_input.as_str(), index);
index = index + 1;
if index == 0 {
r.primary.index = value.len();
r.secondary.index = r.primary.index;
} else {
r.primary.index = index;
r.secondary.index = r.primary.index;
}
state.cursor.set_char_range(Some(r));
TextEditState::store(state, ui.ctx(), id);
}
}
}
*w_input = "".to_string();
ui.ctx().request_repaint();
}
}
/// Calculate item background/button rounding based on item index. /// Calculate item background/button rounding based on item index.
pub fn item_rounding(index: usize, len: usize, is_button: bool) -> Rounding { pub fn item_rounding(index: usize, len: usize, is_button: bool) -> Rounding {
let corners = if is_button { let corners = if is_button {