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

Draw insertion point even for empty input fields

Browse source 
This allows text layout to generate an empty text fragment if the fragment
contains the insertion point for a text input box.
This commit is contained in:
Matt Brubeck 2016-04-01 20:18:28 -07:00
parent 831243af7c
commit 32aad0838e
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/text.rs
View file

@ -239,6 +239,7 @@ impl TextRunScanner {
mapping.flush(&mut mappings,
&mut run_info,
&**text,
insertion_point,
compression,
text_transform,
&mut last_whitespace,
@ -268,6 +269,7 @@ impl TextRunScanner {
mapping.flush(&mut mappings,
&mut run_info,
&**text,
insertion_point,
compression,
text_transform,
&mut last_whitespace,
@ -336,6 +338,7 @@ impl TextRunScanner {
let scanned_run = runs[mapping.text_run_index].clone();
let requires_line_break_afterward_if_wrapping_on_newlines =
!mapping.byte_range.is_empty() &&
scanned_run.run.text.char_at_reverse(mapping.byte_range.end()) == '\n';
if requires_line_break_afterward_if_wrapping_on_newlines {
mapping.char_range.extend_by(CharIndex(-1));
@ -575,12 +578,13 @@ impl RunMapping {
mappings: &mut Vec<RunMapping>,
run_info: &mut RunInfo,
text: &str,
insertion_point: Option<CharIndex>,
compression: CompressionMode,
text_transform: text_transform::T,
last_whitespace: &mut bool,
start_position: &mut usize,
end_position: usize) {
if *start_position == end_position {
if *start_position == end_position && insertion_point.is_none() {
return;
}
let old_byte_length = run_info.text.len();
@ -601,9 +605,9 @@ impl RunMapping {
run_info.character_length = run_info.character_length + character_count;
*start_position = end_position;
// Don't flush empty mappings.
if character_count == 0 {
return
// Don't flush mappings that contain no characters and no insertion_point.
if character_count == 0 && !self.contains_insertion_point(insertion_point) {
return;
}
let new_byte_length = run_info.text.len();