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

auto merge of #4267 : ema-fox/servo/textinput, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-12-08 09:04:14 -07:00
commit 9ac817523c
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
components/script/textinput.rs
View file

@ -163,9 +163,9 @@ impl TextInput {
self.edit_point.index = 0; self.edit_point.index = 0;
self.edit_point.line = 0; self.edit_point.line = 0;
return; return;
} else if adjust > 0 && self.edit_point.line >= min(0, self.lines.len() - adjust as uint) { } else if adjust > 0 && self.edit_point.line + adjust as uint >= self.lines.len() {
self.edit_point.index = self.current_line_length();
self.edit_point.line = self.lines.len() - 1; self.edit_point.line = self.lines.len() - 1;
self.edit_point.index = self.current_line_length();
return; return;
} }
@ -178,29 +178,20 @@ impl TextInput {
/// adjusted vertically and the process repeats with the remaining adjustment requested. /// adjusted vertically and the process repeats with the remaining adjustment requested.
fn adjust_horizontal(&mut self, adjust: int) { fn adjust_horizontal(&mut self, adjust: int) {
if adjust < 0 { if adjust < 0 {
if self.multiline { let remaining = self.edit_point.index;
let remaining = self.edit_point.index; if adjust.abs() as uint > remaining && self.edit_point.line > 0 {
if adjust.abs() as uint > remaining { self.adjust_vertical(-1);
self.edit_point.index = 0; self.edit_point.index = self.current_line_length();
self.adjust_vertical(-1); self.adjust_horizontal(adjust + remaining as int);
self.edit_point.index = self.current_line_length();
self.adjust_horizontal(adjust + remaining as int);
} else {
self.edit_point.index = (self.edit_point.index as int + adjust) as uint;
}
} else { } else {
self.edit_point.index = max(0, self.edit_point.index as int + adjust) as uint; self.edit_point.index = max(0, self.edit_point.index as int + adjust) as uint;
} }
} else { } else {
if self.multiline { let remaining = self.current_line_length() - self.edit_point.index;
let remaining = self.current_line_length() - self.edit_point.index; if adjust as uint > remaining && self.edit_point.line < self.lines.len() - 1 {
if adjust as uint > remaining { self.edit_point.index = 0;
self.edit_point.index = 0; self.adjust_vertical(1);
self.adjust_vertical(1); self.adjust_horizontal(adjust - remaining as int);
self.adjust_horizontal(adjust - remaining as int);
} else {
self.edit_point.index += adjust as uint;
}
} else { } else {
self.edit_point.index = min(self.current_line_length(), self.edit_point.index = min(self.current_line_length(),
self.edit_point.index + adjust as uint); self.edit_point.index + adjust as uint);
@ -268,6 +259,14 @@ impl TextInput {
self.edit_point.index = self.current_line_length(); self.edit_point.index = self.current_line_length();
Nothing Nothing
} }
"PageUp" => {
self.adjust_vertical(-28);
Nothing
}
"PageDown" => {
self.adjust_vertical(28);
Nothing
}
"Tab" => TriggerDefaultAction, "Tab" => TriggerDefaultAction,
_ => Nothing, _ => Nothing,
} }