language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-02 22:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix multi-byte handling hit testing

Browse source 
Return a byte offset within the string for the hit test in TextInput.
This commit is contained in:
Simon Hausmann 2020-09-22 18:43:00 +02:00
parent adfadd12fa
commit 49edd69a3a
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sixtyfps_runtime/corelib/items.rs
View file

@ -835,8 +835,8 @@ pub struct TextInput {
pub y: Property<f32>,
pub width: Property<f32>,
pub height: Property<f32>,
pub cursor_position: Property<i32>,
pub anchor_position: Property<i32>,
pub cursor_position: Property<i32>, // byte offset,
pub anchor_position: Property<i32>, // byte offset
pub text_cursor_width: Property<f32>,
pub cursor_visible: Property<bool>,
pub accepted: Signal<()>,
@ -952,16 +952,16 @@ impl Item for TextInput {
InputEventResult::GrabMouse
};
let clicked_index = TextInput::with_font(self, window, |font| {
let clicked_offset = TextInput::with_font(self, window, |font| {
let text = Self::FIELD_OFFSETS.text.apply_pin(self).get();
font.text_index_for_x_position(&text, event.pos.x)
font.text_offset_for_x_position(&text, event.pos.x)
}) as i32;
if matches!(event.what, MouseEventType::MousePressed) {
self.as_ref().pressed.set(true);
self.as_ref().show_cursor(window);
self.as_ref().anchor_position.set(clicked_index);
self.as_ref().cursor_position.set(clicked_index);
self.as_ref().anchor_position.set(clicked_offset);
self.as_ref().cursor_position.set(clicked_offset);
}
match event.what {
@ -969,7 +969,7 @@ impl Item for TextInput {
self.as_ref().pressed.set(false);
}
MouseEventType::MouseMoved if self.as_ref().pressed.get() => {
self.as_ref().cursor_position.set(clicked_index);
self.as_ref().cursor_position.set(clicked_offset);
}
_ => {}
}