language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-03 07:04:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Rename KeyEvent::KeyPress::string to text

Browse source 
It's the textual representation of the key
This commit is contained in:
Simon Hausmann 2021-01-22 10:33:15 +01:00
parent 916ad96ea5
commit 886dd425fc
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sixtyfps_runtime/corelib/input.rs
View file

@ -245,14 +245,14 @@ pub enum KeyEvent {
/// A key on a keyboard was pressed. /// A key on a keyboard was pressed.
KeyPressed { KeyPressed {
/// The unicode representation of the key pressed. /// The unicode representation of the key pressed.
string: SharedString, text: SharedString,
/// The keyboard modifiers active at the time of the key press event. /// The keyboard modifiers active at the time of the key press event.
modifiers: KeyboardModifiers, modifiers: KeyboardModifiers,
}, },
/// A key on a keyboard was released. /// A key on a keyboard was released.
KeyReleased { KeyReleased {
/// The unicode representation of the key released. /// The unicode representation of the key released.
string: SharedString, text: SharedString,
/// The keyboard modifiers active at the time of the key release event. /// The keyboard modifiers active at the time of the key release event.
modifiers: KeyboardModifiers, modifiers: KeyboardModifiers,
}, },

8
sixtyfps_runtime/corelib/items.rs
View file

@ -426,11 +426,11 @@ impl Item for FocusScope {
fn key_event(self: Pin<&Self>, event: &KeyEvent, _window: &ComponentWindow) -> KeyEventResult { fn key_event(self: Pin<&Self>, event: &KeyEvent, _window: &ComponentWindow) -> KeyEventResult {
match event { match event {
KeyEvent::KeyPressed { string, .. } => { KeyEvent::KeyPressed { text, .. } => {
Self::FIELD_OFFSETS.key_pressed.apply_pin(self).emit(&(string.clone(),)); Self::FIELD_OFFSETS.key_pressed.apply_pin(self).emit(&(text.clone(),));
} }
KeyEvent::KeyReleased { string, .. } => { KeyEvent::KeyReleased { text, .. } => {
Self::FIELD_OFFSETS.key_released.apply_pin(self).emit(&(string.clone(),)); Self::FIELD_OFFSETS.key_released.apply_pin(self).emit(&(text.clone(),));
} }
}; };
KeyEventResult::EventAccepted KeyEventResult::EventAccepted

16
sixtyfps_runtime/corelib/items/text.rs
View file

@ -270,8 +270,8 @@ impl Item for TextInput {
} }
match event { match event {
KeyEvent::KeyPressed { string, modifiers } => { KeyEvent::KeyPressed { text, modifiers } => {
if let Some(keycode) = InternalKeyCode::try_decode_from_string(string) { if let Some(keycode) = InternalKeyCode::try_decode_from_string(text) {
if let Ok(text_cursor_movement) = TextCursorDirection::try_from(keycode.clone()) if let Ok(text_cursor_movement) = TextCursorDirection::try_from(keycode.clone())
{ {
TextInput::move_cursor( TextInput::move_cursor(
@ -294,15 +294,15 @@ impl Item for TextInput {
} }
KeyEventResult::EventIgnored KeyEventResult::EventIgnored
} }
KeyEvent::KeyReleased { string, modifiers } KeyEvent::KeyReleased { text: event_text, modifiers }
// Only insert/interpreter non-control character strings // Only insert/interpreter non-control character strings
if !string.is_empty() && string.as_str().chars().all(|ch| !ch.is_control()) => if !event_text.is_empty() && event_text.as_str().chars().all(|ch| !ch.is_control()) =>
{ {
if modifiers.test_exclusive(crate::input::COPY_PASTE_MODIFIER) { if modifiers.test_exclusive(crate::input::COPY_PASTE_MODIFIER) {
if string == "c" { if event_text == "c" {
self.copy(); self.copy();
return KeyEventResult::EventAccepted; return KeyEventResult::EventAccepted;
} else if string == "v" { } else if event_text == "v" {
self.paste(); self.paste();
return KeyEventResult::EventAccepted; return KeyEventResult::EventAccepted;
} }
@ -313,10 +313,10 @@ impl Item for TextInput {
// FIXME: respect grapheme boundaries // FIXME: respect grapheme boundaries
let insert_pos = self.cursor_position() as usize; let insert_pos = self.cursor_position() as usize;
text.insert_str(insert_pos, &string); text.insert_str(insert_pos, &event_text);
self.as_ref().text.set(text.into()); self.as_ref().text.set(text.into());
let new_cursor_pos = (insert_pos + string.len()) as i32; let new_cursor_pos = (insert_pos + event_text.len()) as i32;
self.as_ref().cursor_position.set(new_cursor_pos); self.as_ref().cursor_position.set(new_cursor_pos);
self.as_ref().anchor_position.set(new_cursor_pos); self.as_ref().anchor_position.set(new_cursor_pos);

6
sixtyfps_runtime/corelib/tests.rs
View file

@ -73,9 +73,9 @@ pub extern "C" fn send_keyboard_string_sequence(
if ch.is_ascii_uppercase() { if ch.is_ascii_uppercase() {
modifiers |= SHIFT_MODIFIER; modifiers |= SHIFT_MODIFIER;
} }
let string: SharedString = ch.to_string().into(); let text: SharedString = ch.to_string().into();
window.process_key_input(&KeyEvent::KeyPressed { string: string.clone(), modifiers }); window.process_key_input(&KeyEvent::KeyPressed { text: text.clone(), modifiers });
window.process_key_input(&KeyEvent::KeyReleased { string, modifiers }); window.process_key_input(&KeyEvent::KeyReleased { text, modifiers });
} }
} }

8
sixtyfps_runtime/rendering_backends/gl/eventloop.rs
View file

@ -319,14 +319,14 @@ pub fn run() {
} }
}) })
{ {
let string = key_code.encode_to_string(); let text = key_code.encode_to_string();
let event = match input.state { let event = match input.state {
winit::event::ElementState::Pressed => KeyEvent::KeyPressed { winit::event::ElementState::Pressed => KeyEvent::KeyPressed {
string, text,
modifiers: window.current_keyboard_modifiers(), modifiers: window.current_keyboard_modifiers(),
}, },
winit::event::ElementState::Released => KeyEvent::KeyReleased { winit::event::ElementState::Released => KeyEvent::KeyReleased {
string, text,
modifiers: window.current_keyboard_modifiers(), modifiers: window.current_keyboard_modifiers(),
}, },
}; };
@ -357,7 +357,7 @@ pub fn run() {
if !modifiers.control() && !modifiers.alt() && !modifiers.logo() { if !modifiers.control() && !modifiers.alt() && !modifiers.logo() {
let key_event = KeyEvent::KeyReleased { let key_event = KeyEvent::KeyReleased {
string: ch.to_string().into(), text: ch.to_string().into(),
modifiers, modifiers,
}; };
window window

6
sixtyfps_runtime/rendering_backends/qt/qt_window.rs
View file

@ -661,7 +661,7 @@ impl QtWindow {
modifiers |= sixtyfps_corelib::input::LOGO_MODIFIER modifiers |= sixtyfps_corelib::input::LOGO_MODIFIER
} }
let string = match key as key_generated::Qt_Key { let text = match key as key_generated::Qt_Key {
key_generated::Qt_Key_Key_Left => Some(InternalKeyCode::Left), key_generated::Qt_Key_Key_Left => Some(InternalKeyCode::Left),
key_generated::Qt_Key_Key_Right => Some(InternalKeyCode::Right), key_generated::Qt_Key_Key_Right => Some(InternalKeyCode::Right),
key_generated::Qt_Key_Key_Backspace => Some(InternalKeyCode::Back), key_generated::Qt_Key_Key_Backspace => Some(InternalKeyCode::Back),
@ -674,9 +674,9 @@ impl QtWindow {
.map_or_else(|| text.into(), |code| code.encode_to_string()); .map_or_else(|| text.into(), |code| code.encode_to_string());
let event = if released { let event = if released {
KeyEvent::KeyReleased { string, modifiers } KeyEvent::KeyReleased { text, modifiers }
} else { } else {
KeyEvent::KeyPressed { string, modifiers } KeyEvent::KeyPressed { text, modifiers }
}; };
self.self_weak.get().unwrap().upgrade().unwrap().process_key_input(&event); self.self_weak.get().unwrap().upgrade().unwrap().process_key_input(&event);