Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correctly determine text selection direction

Browse source 
Add some debug! output.

Closes #21891
This commit is contained in:
Pyfisch 2018-10-17 22:39:37 +02:00
parent 9a0404ac5f
commit c2ea135c49
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/script/textinput.rs
View file

@ -293,6 +293,12 @@ impl<T: ClipboardProvider> TextInput<T> {
// Check that the selection is valid. // Check that the selection is valid.
fn assert_ok_selection(&self) { fn assert_ok_selection(&self) {
debug!(
"edit_point: {:?}, selection_origin: {:?}, direction: {:?}",
self.edit_point,
self.selection_origin,
self.selection_direction
);
if let Some(begin) = self.selection_origin { if let Some(begin) = self.selection_origin {
debug_assert!(begin.line < self.lines.len()); debug_assert!(begin.line < self.lines.len());
debug_assert!(begin.index <= self.lines[begin.line].len()); debug_assert!(begin.index <= self.lines[begin.line].len());
@ -506,11 +512,6 @@ impl<T: ClipboardProvider> TextInput<T> {
if self.selection_origin.is_none() { if self.selection_origin.is_none() {
self.selection_origin = Some(self.edit_point); self.selection_origin = Some(self.edit_point);
} }
self.selection_direction = match adjust {
Direction::Backward => SelectionDirection::Backward,
Direction::Forward => SelectionDirection::Forward,
};
} else { } else {
if self.has_selection() { if self.has_selection() {
self.edit_point = match adjust { self.edit_point = match adjust {
@ -524,6 +525,23 @@ impl<T: ClipboardProvider> TextInput<T> {
false false
} }
/// Update the field selection_direction.
///
/// When the edit_point (or focus) is before the selection_origin (or anchor)
/// you have a backward selection. Otherwise you have a forward selection.
fn update_selection_direction(&mut self) {
debug!(
"edit_point: {:?}, selection_origin: {:?}",
self.edit_point,
self.selection_origin
);
self.selection_direction = if Some(self.edit_point) < self.selection_origin {
SelectionDirection::Backward
} else {
SelectionDirection::Forward
}
}
fn perform_horizontal_adjustment(&mut self, adjust: isize, select: Selection) { fn perform_horizontal_adjustment(&mut self, adjust: isize, select: Selection) {
if adjust < 0 { if adjust < 0 {
let remaining = self.edit_point.index; let remaining = self.edit_point.index;
@ -548,6 +566,7 @@ impl<T: ClipboardProvider> TextInput<T> {
); );
} }
} }
self.update_selection_direction();
self.assert_ok_selection(); self.assert_ok_selection();
} }