leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
Hojjat 2022-12-16 19:15:04 -07:00 • committed by Jeremy Soller
parent 089a926615
commit cb958c63f8
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/edit/vi.rs
View file

@ -358,7 +358,7 @@ impl<'a> Edit<'a> for ViEditor<'a> {
let (start_x, end_x) = match run.glyphs.get(cursor_glyph) { let (start_x, end_x) = match run.glyphs.get(cursor_glyph) {
Some(glyph) => { Some(glyph) => {
// Start of detected glyph // Start of detected glyph
if glyph.rtl { if glyph.level.is_rtl() {
( (
(glyph.x + glyph.w - cursor_glyph_offset) as i32, (glyph.x + glyph.w - cursor_glyph_offset) as i32,
(glyph.x + glyph.w - cursor_glyph_offset - cursor_glyph_width) as i32, (glyph.x + glyph.w - cursor_glyph_offset - cursor_glyph_width) as i32,
@ -373,7 +373,7 @@ impl<'a> Edit<'a> for ViEditor<'a> {
None => match run.glyphs.last() { None => match run.glyphs.last() {
Some(glyph) => { Some(glyph) => {
// End of last glyph // End of last glyph
if glyph.rtl { if glyph.level.is_rtl() {
( (
glyph.x as i32, glyph.x as i32,
(glyph.x - cursor_glyph_width) as i32 (glyph.x - cursor_glyph_width) as i32

15
src/shape.rs
View file

@ -498,10 +498,9 @@ impl ShapeLine {
// Reset some whitespace chars to paragraph level. // Reset some whitespace chars to paragraph level.
// <http://www.unicode.org/reports/tr9/#L1> // <http://www.unicode.org/reports/tr9/#L1>
let line_str: &str = &text[..];
let mut reset_from: Option<usize> = Some(0); let mut reset_from: Option<usize> = Some(0);
let mut reset_to: Option<usize> = None; let mut reset_to: Option<usize> = None;
for (i, c) in line_str.char_indices() { for (i, c) in text.char_indices() {
match line_classes[i] { match line_classes[i] {
// Ignored by X9 // Ignored by X9
RLE | LRE | RLO | LRO | PDF | BN => {} RLE | LRE | RLO | LRO | PDF | BN => {}
@ -509,13 +508,13 @@ impl ShapeLine {
B | S => { B | S => {
assert_eq!(reset_to, None); assert_eq!(reset_to, None);
reset_to = Some(i + c.len_utf8()); reset_to = Some(i + c.len_utf8());
if reset_from == None { if reset_from.is_none() {
reset_from = Some(i); reset_from = Some(i);
} }
} }
// Whitespace, isolate formatting // Whitespace, isolate formatting
WS | FSI | LRI | RLI | PDI => { WS | FSI | LRI | RLI | PDI => {
if reset_from == None { if reset_from.is_none() {
reset_from = Some(i); reset_from = Some(i);
} }
} }
@ -540,7 +539,7 @@ impl ShapeLine {
} }
// A modified version of second part of unicode_bidi::bidi_info::visual run // A modified version of second part of unicode_bidi::bidi_info::visual run
fn reorder(&self, line_range: &Vec<(usize, Range<usize>)>) -> Vec<Range<usize>> { fn reorder(&self, line_range: &[(usize, Range<usize>)]) -> Vec<Range<usize>> {
let line : Vec<unicode_bidi::Level> = line_range.iter().map(|(span_index, _)| self.spans[*span_index].level).collect(); let line : Vec<unicode_bidi::Level> = line_range.iter().map(|(span_index, _)| self.spans[*span_index].level).collect();
// Find consecutive level runs. // Find consecutive level runs.
let mut runs = Vec::new(); let mut runs = Vec::new();
@ -744,13 +743,13 @@ impl ShapeLine {
} }
} }
if current_visual_line.len() > 0 { if !current_visual_line.is_empty() {
vl_range_of_spans.push(current_visual_line); vl_range_of_spans.push(current_visual_line);
} }
for visual_line in &vl_range_of_spans { for visual_line in &vl_range_of_spans {
let new_order = self.reorder(&visual_line); let new_order = self.reorder(visual_line);
let mut glyphs = Vec::with_capacity(1); let mut glyphs = Vec::with_capacity(1);
x = start_x; x = start_x;
y = 0.; y = 0.;
@ -807,7 +806,7 @@ impl ShapeLine {
} }
if push_line { if push_line {
layout_lines.push(LayoutLine { w: 0.0 , glyphs: vec![] }); layout_lines.push(LayoutLine { w: 0.0 , glyphs: Default::default() });
} }
layout_lines layout_lines