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

auto merge of #4456 : ema-fox/servo/textinput_selection, r=jdm

Browse source 
Fixes #4447
This commit is contained in:
bors-servo 2014-12-21 07:24:44 -07:00
commit bde6c39192
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/textinput.rs
View file

@ -97,15 +97,20 @@ impl TextInput {
self.replace_selection(ch.to_string());
}
fn replace_selection(&mut self, insert: String) {
let begin = self.selection_begin.take().unwrap();
fn get_sorted_selection(&self) -> (TextPoint, TextPoint) {
let begin = self.selection_begin.unwrap();
let end = self.edit_point;
let (begin, end) = if begin.line < end.line || (begin.line == end.line && begin.index < end.index) {
if begin.line < end.line || (begin.line == end.line && begin.index < end.index) {
(begin, end)
} else {
(end, begin)
};
}
}
fn replace_selection(&mut self, insert: String) {
let (begin, end) = self.get_sorted_selection();
self.selection_begin = None;
let new_lines = {
let prefix = self.lines[begin.line].slice_chars(0, begin.index);
@ -186,7 +191,12 @@ impl TextInput {
self.selection_begin = Some(self.edit_point);
}
} else {
if self.selection_begin.is_some() {
let (begin, end) = self.get_sorted_selection();
self.edit_point = if adjust < 0 {begin} else {end};
self.selection_begin = None;
return
}
}
if adjust < 0 {