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

Have TextBuffer own FontMatches

Browse source
This commit is contained in:
Jeremy Soller 2022-10-25 11:10:44 -06:00
parent 1c341f3126
commit 0f446368ca
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
5 changed files with 42 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/buffer.rs
View file

@ -167,7 +167,7 @@ impl TextBufferLine {
/// A buffer of text that is shaped and laid out
pub struct TextBuffer<'a> {
font_matches: &'a FontMatches<'a>,
font_matches: FontMatches<'a>,
lines: Vec<TextBufferLine>,
metrics: TextMetrics,
width: i32,
@ -182,7 +182,7 @@ pub struct TextBuffer<'a> {
impl<'a> TextBuffer<'a> {
pub fn new(
font_matches: &'a FontMatches<'a>,
font_matches: FontMatches<'a>,
metrics: TextMetrics,
) -> Self {
let mut buffer = Self {
@ -217,7 +217,7 @@ impl<'a> TextBuffer<'a> {
reshaped += 1;
}
let layout = line.layout(
self.font_matches,
&self.font_matches,
self.metrics.font_size,
self.width
);
@ -247,7 +247,7 @@ impl<'a> TextBuffer<'a> {
reshaped += 1;
}
let layout = line.layout(
self.font_matches,
&self.font_matches,
self.metrics.font_size,
self.width
);
@ -309,7 +309,7 @@ impl<'a> TextBuffer<'a> {
if line.shape_opt.is_some() {
line.layout_opt = None;
line.layout(
self.font_matches,
&self.font_matches,
self.metrics.font_size,
self.width
);
@ -368,7 +368,7 @@ impl<'a> TextBuffer<'a> {
fn set_layout_cursor(&mut self, cursor: LayoutCursor) {
let line = &mut self.lines[cursor.line.get()];
let layout = line.layout(
self.font_matches,
&self.font_matches,
self.metrics.font_size,
self.width
);
@ -547,7 +547,7 @@ impl<'a> TextBuffer<'a> {
let layout_len = {
let line = &mut self.lines[cursor.line.get()];
let layout = line.layout(
self.font_matches,
&self.font_matches,
self.metrics.font_size,
self.width
);
@ -984,7 +984,7 @@ impl<'a> TextBuffer<'a> {
for glyph in layout_line.glyphs.iter() {
let (cache_key, x_int, y_int) = (glyph.cache_key, glyph.x_int, glyph.y_int);
self.cache.with_pixels(self.font_matches, cache_key, color, |x, y, color| {
self.cache.with_pixels(&self.font_matches, cache_key, color, |x, y, color| {
f(x_int + x, line_y + y_int + y, 1, 1, color)
});
}