FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure caret position is correct when setting new text in text box

Browse Source 
- #362
This commit is contained in:
Dmitry
2022-09-12 16:56:11 +03:00
parent 30b32c23cb
commit 2be837f06b
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-ui/src/text_box.rs
+17 -1
View File
@@ -423,7 +423,10 @@ impl TextBox {
if offset >= self.caret_position.offset {
break;
}
if let Some(glyph) = font.glyphs().get(text[char_index].glyph_index as usize) {
if let Some(glyph) = text
.get(char_index)
.and_then(|c| font.glyphs().get(c.glyph_index as usize))
{
caret_pos.x += glyph.advance;
} else {
caret_pos.x += font.height();
@@ -520,6 +523,14 @@ impl TextBox {
}
}
pub fn is_valid_position(&self, position: Position) -> bool {
self.formatted_text
.borrow()
.get_lines()
.get(position.line)
.map_or(false, |line| position.offset < line.len())
}
fn set_caret_position(&mut self, position: Position) {
self.caret_position = position;
self.ensure_caret_visible();
@@ -1133,6 +1144,11 @@ impl Control for TextBox {
drop(text);
self.invalidate_layout();
// Make sure caret will stay in valid bounds.
if !self.is_valid_position(self.caret_position) {
self.set_caret_position(self.end_position());
}
if self.commit_mode == TextCommitMode::Immediate {
ui.send_message(message.reverse());
}