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

Refactor of scroll and shaping

Browse source 
- Scroll is identified by line index and layout index, instead of just
  layout index
- Shaping has the option to prune, where caches outside of the scroll
  view are cleared
- Syntax editor no longer requires layout of all lines, only of lines
  inside scroll
- BufferLine has a metadata field that can be used by other abstractions
  to know when text was changed
This commit is contained in:
Jeremy Soller 2023-12-15 13:37:59 -07:00
parent e7261fc06e
commit d0b4b4635e
16 changed files with 213 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

19
examples/multiview/src/main.rs
View file

@ -1,6 +1,8 @@
// SPDX-License-Identifier: MIT OR Apache-2.0
use cosmic_text::{Action, Attrs, Buffer, Edit, Family, FontSystem, Metrics, Shaping, SwashCache};
use cosmic_text::{
Action, Attrs, Buffer, Edit, Family, FontSystem, Metrics, Scroll, Shaping, SwashCache,
};
use std::{collections::HashMap, env, fs, num::NonZeroU32, rc::Rc, slice};
use tiny_skia::{Color, Paint, PixmapMut, Rect, Transform};
use winit::{
@ -41,7 +43,7 @@ fn main() {
window: Rc<WinitWindow>,
context: softbuffer::Context<Rc<WinitWindow>>,
surface: softbuffer::Surface<Rc<WinitWindow>, Rc<WinitWindow>>,
scroll: i32,
scroll: Scroll,
}
let mut windows = HashMap::new();
for _ in 0..2 {
@ -54,7 +56,7 @@ fn main() {
window,
context,
surface,
scroll: 0,
scroll: Scroll::default(),
},
);
}
@ -102,7 +104,8 @@ fn main() {
// Set size, will relayout and shape until scroll if changed
buffer.set_size(width as f32, height as f32);
// Shape until scroll, ensures scroll is clamped
buffer.shape_until_scroll();
//TODO: ability to prune with multiple views?
buffer.shape_until_scroll(true);
// Update scroll after buffer clamps it
*scroll = buffer.scroll();
@ -145,16 +148,16 @@ fn main() {
if state == ElementState::Pressed {
match logical_key {
Key::Named(NamedKey::ArrowDown) => {
*scroll += 1;
scroll.layout += 1;
}
Key::Named(NamedKey::ArrowUp) => {
*scroll -= 1;
scroll.layout -= 1;
}
Key::Named(NamedKey::PageDown) => {
*scroll += buffer.visible_lines();
scroll.layout += buffer.visible_lines();
}
Key::Named(NamedKey::PageUp) => {
*scroll -= buffer.visible_lines();
scroll.layout -= buffer.visible_lines();
}
_ => {}
}