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

Fix issues

Browse source
This commit is contained in:
A-Walrus 2024-08-22 16:08:38 +03:00 • committed by Jeremy Soller
parent 72355aa935
commit 0c0b0e1a76
1 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/terminal_box.rs
View file

@ -34,6 +34,7 @@ use cosmic::{
use cosmic_text::LayoutGlyph; use cosmic_text::LayoutGlyph;
use indexmap::IndexSet; use indexmap::IndexSet;
use std::{ use std::{
array,
cell::Cell, cell::Cell,
cmp, cmp,
collections::HashMap, collections::HashMap,
@ -406,12 +407,13 @@ where
renderer.fill_quad(underline2_quad, line_color); renderer.fill_quad(underline2_quad, line_color);
} }
// rects is a slice of (width, Option<y>), `None` means a gap.
let mut draw_repeated = |rects: &[(f32, Option<f32>)]| { let mut draw_repeated = |rects: &[(f32, Option<f32>)]| {
let full_width = self.end_x - self.start_x; let full_width = self.end_x - self.start_x;
let pattern_len: f32 = rects.iter().map(|x| x.0).sum(); let pattern_len: f32 = rects.iter().map(|x| x.0).sum(); // total length of the pattern
let mut pos = 0.0; let mut accu_width = 0.0;
let mut index = { let mut index = {
let in_pattern = (self.start_x) % pattern_len; let in_pattern = self.start_x % pattern_len;
let mut sum = 0.0; let mut sum = 0.0;
let mut index = 0; let mut index = 0;
@ -420,54 +422,63 @@ where
if in_pattern < sum { if in_pattern < sum {
let width = sum - in_pattern; let width = sum - in_pattern;
if let Some(height) = rect.1 { if let Some(height) = rect.1 {
let pos_offset = mk_pos_offset!(pos, height); // draw first rect cropped to span
let pos_offset = mk_pos_offset!(accu_width, height);
let underline_quad = let underline_quad =
mk_quad!(pos_offset, style_line_height, width); mk_quad!(pos_offset, style_line_height, width);
renderer.fill_quad(underline_quad, line_color); renderer.fill_quad(underline_quad, line_color);
} }
index = i + 1; index = i + 1;
pos += width; accu_width += width;
break; break;
} }
} }
index index // index of first full rect
}; };
while pos < full_width { while accu_width < full_width {
let (width, x) = rects[index % rects.len()]; let (width, x) = rects[index % rects.len()];
let cropped_width = width.min(full_width - accu_width);
if let Some(height) = x { if let Some(height) = x {
let pos_offset = mk_pos_offset!(pos, height); let pos_offset = mk_pos_offset!(accu_width, height);
let underline_quad = let underline_quad =
mk_quad!(pos_offset, style_line_height, width); mk_quad!(pos_offset, style_line_height, cropped_width);
renderer.fill_quad(underline_quad, line_color); renderer.fill_quad(underline_quad, line_color);
} }
pos += width; accu_width += cropped_width;
index += 1; index += 1;
} }
}; };
if metadata.flags.contains(Flags::DOTTED_UNDERLINE) { if metadata.flags.contains(Flags::DOTTED_UNDERLINE) {
let bottom_offset = style_line_height * 2.0; let bottom_offset = style_line_height * 2.0;
draw_repeated(&[(2.0, Some(bottom_offset)), (3.0, None)]); let dot = (2.0, Some(bottom_offset));
let gap = (2.0, None);
draw_repeated(&[dot, gap]);
} }
if metadata.flags.contains(Flags::DASHED_UNDERLINE) { if metadata.flags.contains(Flags::DASHED_UNDERLINE) {
let bottom_offset = style_line_height * 2.0; let bottom_offset = style_line_height * 2.0;
draw_repeated(&[(6.0, Some(bottom_offset)), (3.0, None)]); let dot = (2.0, Some(bottom_offset));
let gap = (3.0, None);
draw_repeated(&[dot, gap]);
} }
if metadata.flags.contains(Flags::UNDERCURL) { if metadata.flags.contains(Flags::UNDERCURL) {
let style_line_height = style_line_height.floor(); let style_line_height = style_line_height.floor();
let bottom_offset = style_line_height * 1.5; let bottom_offset = style_line_height * 1.5;
let pattern: [(f32, Option<f32>); 8] =
let pattern: Vec<_> = (0..8) array::from_fn(|i| match i {
.map(|i| match i { 3..=5 => (1.0, Some(bottom_offset + style_line_height)),
3..=5 => bottom_offset + style_line_height, 2 | 6 => (
2 | 6 => bottom_offset + 2.0 * style_line_height / 3.0, 1.0,
1 | 7 => bottom_offset + 1.0 * style_line_height / 3.0, Some(bottom_offset + 2.0 * style_line_height / 3.0),
_ => bottom_offset, ),
}) 1 | 7 => (
.map(|h| (1.0, Some(h))) 1.0,
.collect(); Some(bottom_offset + 1.0 * style_line_height / 3.0),
),
_ => (1.0, Some(bottom_offset)),
});
draw_repeated(&pattern) draw_repeated(&pattern)
} }
} }