fnmain/glyphon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move text area bounds outside run/glyph loops (#110)

Browse source
This commit is contained in:
Josh Groves 2024-07-29 11:59:26 -02:30 • committed by GitHub
commit ce6ede951c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/text_render.rs
View file

@ -60,14 +60,21 @@ impl TextRenderer {
let resolution = viewport.resolution(); let resolution = viewport.resolution();
for text_area in text_areas { for text_area in text_areas {
let bounds_min_x = text_area.bounds.left.max(0);
let bounds_min_y = text_area.bounds.top.max(0);
let bounds_max_x = text_area.bounds.right.min(resolution.width as i32);
let bounds_max_y = text_area.bounds.bottom.min(resolution.height as i32);
let is_run_visible = |run: &cosmic_text::LayoutRun| { let is_run_visible = |run: &cosmic_text::LayoutRun| {
let start_y = (text_area.top + run.line_top) as i32; let start_y = (text_area.top + run.line_top) as i32;
let end_y = (text_area.top + run.line_top + run.line_height) as i32; let end_y = (text_area.top + run.line_top + run.line_height) as i32;
start_y <= text_area.bounds.bottom && text_area.bounds.top <= end_y start_y <= bounds_max_y && bounds_min_y <= end_y
}; };
let layout_runs = text_area.buffer.layout_runs() let layout_runs = text_area
.buffer
.layout_runs()
.skip_while(|run| !is_run_visible(run)) .skip_while(|run| !is_run_visible(run))
.take_while(is_run_visible); .take_while(is_run_visible);
@ -198,11 +205,6 @@ impl TextRenderer {
let mut width = details.width as i32; let mut width = details.width as i32;
let mut height = details.height as i32; let mut height = details.height as i32;
let bounds_min_x = text_area.bounds.left.max(0);
let bounds_min_y = text_area.bounds.top.max(0);
let bounds_max_x = text_area.bounds.right.min(resolution.width as i32);
let bounds_max_y = text_area.bounds.bottom.min(resolution.height as i32);
// Starts beyond right edge or ends beyond left edge // Starts beyond right edge or ends beyond left edge
let max_x = x + width; let max_x = x + width;
if x > bounds_max_x || max_x < bounds_min_x { if x > bounds_max_x || max_x < bounds_min_x {