me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle motions when a selection is present in text::Editor

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-09-14 14:18:49 +02:00
parent e6c2db8a93
commit b24b94d827
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 70 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/src/text/editor.rs
View file

@ -78,6 +78,29 @@ impl Motion {
_ => self, _ => self,
} }
} }
pub fn direction(&self) -> Direction {
match self {
Self::Left
| Self::Up
| Self::WordLeft
| Self::Home
| Self::PageUp
| Self::DocumentStart => Direction::Left,
Self::Right
| Self::Down
| Self::WordRight
| Self::End
| Self::PageDown
| Self::DocumentEnd => Direction::Right,
}
}
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Direction {
Left,
Right,
} }
/// The cursor of an [`Editor`]. /// The cursor of an [`Editor`].

70
graphics/src/text/editor.rs
View file

@ -1,4 +1,4 @@
use crate::core::text::editor::{self, Action, Cursor, Motion}; use crate::core::text::editor::{self, Action, Cursor, Direction, Motion};
use crate::core::text::LineHeight; use crate::core::text::LineHeight;
use crate::core::{Font, Pixels, Point, Rectangle, Size}; use crate::core::{Font, Pixels, Point, Rectangle, Size};
use crate::text; use crate::text;
@ -219,30 +219,37 @@ impl editor::Editor for Editor {
match action { match action {
// Motion events // Motion events
Action::Move(motion) => { Action::Move(motion) => {
if let Some(_selection) = editor.select_opt() { if let Some(selection) = editor.select_opt() {
let cursor = editor.cursor();
let (left, right) = if cursor < selection {
(cursor, selection)
} else {
(selection, cursor)
};
editor.set_select_opt(None); editor.set_select_opt(None);
match motion {
// These motions are performed as-is even when a selection
// is present
Motion::Home
| Motion::End
| Motion::DocumentStart
| Motion::DocumentEnd => {
editor.action(
font_system.raw(),
motion_to_action(motion),
);
}
// Other motions simply move the cursor to one end of the selection
_ => editor.set_cursor(match motion.direction() {
Direction::Left => left,
Direction::Right => right,
}),
}
} else { } else {
editor.action( editor.action(font_system.raw(), motion_to_action(motion));
font_system.raw(),
match motion {
Motion::Left => cosmic_text::Action::Left,
Motion::Right => cosmic_text::Action::Right,
Motion::Up => cosmic_text::Action::Up,
Motion::Down => cosmic_text::Action::Down,
Motion::WordLeft => cosmic_text::Action::LeftWord,
Motion::WordRight => cosmic_text::Action::RightWord,
Motion::Home => cosmic_text::Action::Home,
Motion::End => cosmic_text::Action::End,
Motion::PageUp => cosmic_text::Action::PageUp,
Motion::PageDown => cosmic_text::Action::PageDown,
Motion::DocumentStart => {
cosmic_text::Action::BufferStart
}
Motion::DocumentEnd => {
cosmic_text::Action::BufferEnd
}
},
);
} }
} }
@ -509,3 +516,20 @@ fn visual_lines_offset(line: usize, buffer: &cosmic_text::Buffer) -> i32 {
visual_lines_before_start as i32 - buffer.scroll() visual_lines_before_start as i32 - buffer.scroll()
} }
fn motion_to_action(motion: Motion) -> cosmic_text::Action {
match motion {
Motion::Left => cosmic_text::Action::Left,
Motion::Right => cosmic_text::Action::Right,
Motion::Up => cosmic_text::Action::Up,
Motion::Down => cosmic_text::Action::Down,
Motion::WordLeft => cosmic_text::Action::LeftWord,
Motion::WordRight => cosmic_text::Action::RightWord,
Motion::Home => cosmic_text::Action::Home,
Motion::End => cosmic_text::Action::End,
Motion::PageUp => cosmic_text::Action::PageUp,
Motion::PageDown => cosmic_text::Action::PageDown,
Motion::DocumentStart => cosmic_text::Action::BufferStart,
Motion::DocumentEnd => cosmic_text::Action::BufferEnd,
}
}