chris/cryoglyph
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use default font color and remove Color

Browse source
This commit is contained in:
grovesNL 2022-10-28 01:24:45 -02:30 • committed by Josh Groves
parent 7eb4d41c25
commit 4c1a83548e
3 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/text_render.rs
View file

@ -1,4 +1,4 @@
use cosmic_text::{CacheKey, SwashCache, SwashContent, TextBuffer};
use cosmic_text::{CacheKey, Color, SwashCache, SwashContent, TextBuffer};
use etagere::{size2, Allocation};
use std::{collections::HashSet, iter, mem::size_of, num::NonZeroU32, slice};
@ -64,6 +64,7 @@ impl TextRenderer {
atlas: &mut TextAtlas,
screen_resolution: Resolution,
buffer: &mut TextBuffer<'a>,
default_color: Color,
cache: &mut SwashCache,
) -> Result<(), PrepareError> {
self.screen_resolution = screen_resolution;
@ -233,6 +234,11 @@ impl TextRenderer {
let line_y = run.line_y;
for glyph in run.glyphs.iter() {
let color = match glyph.color_opt {
Some(some) => some,
None => default_color,
};
let details = atlas.glyph_cache.get(&glyph.cache_key).unwrap();
let mut x = glyph.x_int + details.left as i32;
@ -296,8 +302,7 @@ impl TextRenderer {
pos: [x as i32, y as i32],
dim: [width as u16, height as u16],
uv: [atlas_x, atlas_y],
// TODO
color: [255, 255, 255, 255],
color: color.0,
})
.take(4),
);