leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify motions based on modifier keys, fixes #157

Browse source
This commit is contained in:
Jeremy Soller 2024-03-18 08:58:45 -06:00
parent c7ca83b656
commit 78552e07c3
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/text_box.rs
View file

@ -25,7 +25,9 @@ use cosmic::{
theme::Theme, theme::Theme,
Renderer, Renderer,
}; };
use cosmic_text::{Action, Edit, Metrics, Motion, Scroll, ViEditor}; use cosmic_text::{
Action, BorrowedWithFontSystem, Edit, Metrics, Motion, Scroll, Selection, ViEditor,
};
use std::{ use std::{
cell::Cell, cell::Cell,
cmp, cmp,
@ -757,6 +759,40 @@ where
let mut font_system = font_system().write().unwrap(); let mut font_system = font_system().write().unwrap();
let mut editor = editor.borrow_with(font_system.raw()); let mut editor = editor.borrow_with(font_system.raw());
// Adjust motions based on Ctrl and Shift
fn motion_modifiers(
editor: &mut BorrowedWithFontSystem<'_, ViEditor<'static, 'static>>,
original_motion: Motion,
modifiers: Modifiers,
) {
let motion = if modifiers.control() {
match original_motion {
Motion::Left => Motion::LeftWord,
Motion::Right => Motion::RightWord,
Motion::Home => Motion::BufferStart,
Motion::End => Motion::BufferEnd,
_ => original_motion,
}
} else {
original_motion
};
let cursor = editor.cursor();
match editor.selection() {
Selection::None => {
if modifiers.shift() {
//TODO: Selection::Word if ctrl held?
editor.set_selection(Selection::Normal(cursor));
}
}
_ => {
if !modifiers.shift() {
editor.set_selection(Selection::None)
}
}
}
editor.action(Action::Motion(motion));
}
let mut status = Status::Ignored; let mut status = Status::Ignored;
match event { match event {
Event::Keyboard(KeyEvent::KeyPressed { Event::Keyboard(KeyEvent::KeyPressed {
@ -765,35 +801,35 @@ where
.. ..
}) if state.is_focused && !matches!(key, Named::Space) => match key { }) if state.is_focused && !matches!(key, Named::Space) => match key {
Named::ArrowLeft => { Named::ArrowLeft => {
editor.action(Action::Motion(Motion::Left)); motion_modifiers(&mut editor, Motion::Left, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::ArrowRight => { Named::ArrowRight => {
editor.action(Action::Motion(Motion::Right)); motion_modifiers(&mut editor, Motion::Right, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::ArrowUp => { Named::ArrowUp => {
editor.action(Action::Motion(Motion::Up)); motion_modifiers(&mut editor, Motion::Up, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::ArrowDown => { Named::ArrowDown => {
editor.action(Action::Motion(Motion::Down)); motion_modifiers(&mut editor, Motion::Down, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::Home => { Named::Home => {
editor.action(Action::Motion(Motion::Home)); motion_modifiers(&mut editor, Motion::Home, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::End => { Named::End => {
editor.action(Action::Motion(Motion::End)); motion_modifiers(&mut editor, Motion::End, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::PageUp => { Named::PageUp => {
editor.action(Action::Motion(Motion::PageUp)); motion_modifiers(&mut editor, Motion::PageUp, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::PageDown => { Named::PageDown => {
editor.action(Action::Motion(Motion::PageDown)); motion_modifiers(&mut editor, Motion::PageDown, modifiers);
status = Status::Captured; status = Status::Captured;
} }
Named::Escape => { Named::Escape => {