me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1921 from iced-rs/subpixel-glyph-positioning

Browse source 
Subpixel glyph positioning and layout linearity
This commit is contained in:
Héctor Ramón 2023-06-26 19:17:34 +02:00 • committed by GitHub
commit ef18ecf4ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/src/backend.rs
View file

@ -6,18 +6,6 @@ use iced_core::{Font, Point, Size};
use std::borrow::Cow;
/// The graphics backend of a [`Renderer`].
///
/// [`Renderer`]: crate::Renderer
pub trait Backend {
/// Trims the measurements cache.
///
/// This method is currently necessary to properly trim the text cache in
/// `iced_wgpu` and `iced_glow` because of limitations in the text rendering
/// pipeline. It will be removed in the future.
fn trim_measurements(&mut self) {}
}
/// A graphics backend that supports text rendering.
pub trait Text {
/// The icon font of the backend.

1
graphics/src/lib.rs
View file

@ -41,7 +41,6 @@ pub mod geometry;
pub mod image;
pub use antialiasing::Antialiasing;
pub use backend::Backend;
pub use compositor::Compositor;
pub use error::Error;
pub use gradient::Gradient;

28
graphics/src/renderer.rs
View file

@ -1,5 +1,5 @@
//! Create a renderer from a [`Backend`].
use crate::backend::{self, Backend};
use crate::backend;
use crate::Primitive;
use iced_core::image;
@ -16,13 +16,13 @@ use std::marker::PhantomData;
/// A backend-agnostic renderer that supports all the built-in widgets.
#[derive(Debug)]
pub struct Renderer<B: Backend, Theme> {
pub struct Renderer<B, Theme> {
backend: B,
primitives: Vec<Primitive>,
theme: PhantomData<Theme>,
}
impl<B: Backend, T> Renderer<B, T> {
impl<B, T> Renderer<B, T> {
/// Creates a new [`Renderer`] from the given [`Backend`].
pub fn new(backend: B) -> Self {
Self {
@ -52,10 +52,7 @@ impl<B: Backend, T> Renderer<B, T> {
}
}
impl<B, T> iced_core::Renderer for Renderer<B, T>
where
B: Backend,
{
impl<B, T> iced_core::Renderer for Renderer<B, T> {
type Theme = T;
fn layout<Message>(
@ -63,11 +60,7 @@ where
element: &Element<'_, Message, Self>,
limits: &layout::Limits,
) -> layout::Node {
let layout = element.as_widget().layout(self, limits);
self.backend.trim_measurements();
layout
element.as_widget().layout(self, limits)
}
fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
@ -116,7 +109,7 @@ where
impl<B, T> text::Renderer for Renderer<B, T>
where
B: Backend + backend::Text,
B: backend::Text,
{
type Font = Font;
@ -195,7 +188,7 @@ where
impl<B, T> image::Renderer for Renderer<B, T>
where
B: Backend + backend::Image,
B: backend::Image,
{
type Handle = image::Handle;
@ -210,7 +203,7 @@ where
impl<B, T> svg::Renderer for Renderer<B, T>
where
B: Backend + backend::Svg,
B: backend::Svg,
{
fn dimensions(&self, handle: &svg::Handle) -> Size<u32> {
self.backend().viewport_dimensions(handle)
@ -231,10 +224,7 @@ where
}
#[cfg(feature = "geometry")]
impl<B, T> crate::geometry::Renderer for Renderer<B, T>
where
B: Backend,
{
impl<B, T> crate::geometry::Renderer for Renderer<B, T> {
fn draw(&mut self, layers: Vec<crate::Geometry>) {
self.primitives
.extend(layers.into_iter().map(crate::Geometry::into));

6
renderer/src/backend.rs
View file

@ -21,12 +21,6 @@ macro_rules! delegate {
};
}
impl iced_graphics::Backend for Backend {
fn trim_measurements(&mut self) {
delegate!(self, backend, backend.trim_measurements());
}
}
impl backend::Text for Backend {
const ICON_FONT: Font = Font::with_name("Iced-Icons");
const CHECKMARK_ICON: char = '\u{f00c}';

2
tiny_skia/Cargo.toml
View file

@ -24,7 +24,7 @@ features = ["tiny-skia"]
[dependencies.cosmic-text]
git = "https://github.com/hecrj/cosmic-text.git"
rev = "e8b10fd675832cb9c1cc9de30922beb4cf883876"
rev = "c3cd24dc972bb8fd55d016c81ac9fa637e0a4ada"
[dependencies.twox-hash]
version = "1.6"

6
tiny_skia/src/backend.rs
View file

@ -658,12 +658,6 @@ fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
);
}
impl iced_graphics::Backend for Backend {
fn trim_measurements(&mut self) {
self.text_pipeline.trim_measurement_cache();
}
}
impl backend::Text for Backend {
const ICON_FONT: Font = Font::with_name("Iced-Icons");
const CHECKMARK_ICON: char = '\u{f00c}';

51
tiny_skia/src/text.rs
View file

@ -14,8 +14,7 @@ use std::sync::Arc;
pub struct Pipeline {
font_system: RefCell<cosmic_text::FontSystem>,
glyph_cache: GlyphCache,
measurement_cache: RefCell<Cache>,
render_cache: Cache,
cache: RefCell<Cache>,
}
impl Pipeline {
@ -28,8 +27,7 @@ impl Pipeline {
.into_iter(),
)),
glyph_cache: GlyphCache::new(),
measurement_cache: RefCell::new(Cache::new()),
render_cache: Cache::new(),
cache: RefCell::new(Cache::new()),
}
}
@ -37,6 +35,8 @@ impl Pipeline {
self.font_system.get_mut().db_mut().load_font_source(
cosmic_text::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
);
self.cache = RefCell::new(Cache::new());
}
pub fn draw(
@ -54,20 +54,11 @@ impl Pipeline {
pixels: &mut tiny_skia::PixmapMut<'_>,
clip_mask: Option<&tiny_skia::Mask>,
) {
let line_height =
f32::from(line_height.to_absolute(Pixels(size))) * scale_factor;
let bounds = bounds * scale_factor;
let size = size * scale_factor;
let line_height = f32::from(line_height.to_absolute(Pixels(size)));
let font_system = self.font_system.get_mut();
let key = Key {
bounds: {
let size = bounds.size();
// TODO: Reuse buffers from layouting
Size::new(size.width.ceil(), size.height.ceil())
},
bounds: bounds.size(),
content,
font,
size,
@ -75,7 +66,7 @@ impl Pipeline {
shaping,
};
let (_, buffer) = self.render_cache.allocate(font_system, key);
let (_, buffer) = self.cache.get_mut().allocate(font_system, key);
let (total_lines, max_width) = buffer
.layout_runs()
@ -84,7 +75,10 @@ impl Pipeline {
(i + 1, buffer.line_w.max(max))
});
let total_height = total_lines as f32 * line_height;
let total_height = total_lines as f32 * line_height * scale_factor;
let max_width = max_width * scale_factor;
let bounds = bounds * scale_factor;
let x = match horizontal_alignment {
alignment::Horizontal::Left => bounds.x,
@ -98,16 +92,14 @@ impl Pipeline {
alignment::Vertical::Bottom => bounds.y - total_height,
};
// TODO: Subpixel glyph positioning
let x = x.round() as i32;
let y = y.round() as i32;
let mut swash = cosmic_text::SwashCache::new();
for run in buffer.layout_runs() {
for glyph in run.glyphs {
let physical_glyph = glyph.physical((x, y), scale_factor);
if let Some((buffer, placement)) = self.glyph_cache.allocate(
glyph.cache_key,
physical_glyph.cache_key,
color,
font_system,
&mut swash,
@ -120,8 +112,9 @@ impl Pipeline {
.expect("Create glyph pixel map");
pixels.draw_pixmap(
x + glyph.x_int + placement.left,
y - glyph.y_int - placement.top + run.line_y as i32,
physical_glyph.x + placement.left,
physical_glyph.y - placement.top
+ (run.line_y * scale_factor).round() as i32,
pixmap,
&tiny_skia::PixmapPaint::default(),
tiny_skia::Transform::identity(),
@ -133,7 +126,7 @@ impl Pipeline {
}
pub fn trim_cache(&mut self) {
self.render_cache.trim();
self.cache.get_mut().trim();
self.glyph_cache.trim();
}
@ -146,7 +139,7 @@ impl Pipeline {
bounds: Size,
shaping: Shaping,
) -> (f32, f32) {
let mut measurement_cache = self.measurement_cache.borrow_mut();
let mut measurement_cache = self.cache.borrow_mut();
let line_height = f32::from(line_height.to_absolute(Pixels(size)));
@ -183,7 +176,7 @@ impl Pipeline {
point: Point,
_nearest_only: bool,
) -> Option<Hit> {
let mut measurement_cache = self.measurement_cache.borrow_mut();
let mut measurement_cache = self.cache.borrow_mut();
let line_height = f32::from(line_height.to_absolute(Pixels(size)));
@ -203,10 +196,6 @@ impl Pipeline {
Some(Hit::CharOffset(cursor.index))
}
pub fn trim_measurement_cache(&mut self) {
self.measurement_cache.borrow_mut().trim();
}
}
fn to_family(family: font::Family) -> cosmic_text::Family<'static> {

2
wgpu/Cargo.toml
View file

@ -45,7 +45,7 @@ path = "../graphics"
[dependencies.glyphon]
version = "0.2"
git = "https://github.com/hecrj/glyphon.git"
rev = "8dbf36020e5759fa9144517b321372266160113e"
rev = "8324f20158a62f8520bad4ed09f6aa5552f8f2a6"
[dependencies.glam]
version = "0.24"

6
wgpu/src/backend.rs
View file

@ -334,12 +334,6 @@ impl Backend {
}
}
impl iced_graphics::Backend for Backend {
fn trim_measurements(&mut self) {
self.text_pipeline.trim_measurement_cache()
}
}
impl backend::Text for Backend {
const ICON_FONT: Font = Font::with_name("Iced-Icons");
const CHECKMARK_ICON: char = '\u{f00c}';

45
wgpu/src/text.rs
View file

@ -18,8 +18,7 @@ pub struct Pipeline {
renderers: Vec<glyphon::TextRenderer>,
atlas: glyphon::TextAtlas,
prepare_layer: usize,
measurement_cache: RefCell<Cache>,
render_cache: Cache,
cache: RefCell<Cache>,
}
impl Pipeline {
@ -47,8 +46,7 @@ impl Pipeline {
},
),
prepare_layer: 0,
measurement_cache: RefCell::new(Cache::new()),
render_cache: Cache::new(),
cache: RefCell::new(Cache::new()),
}
}
@ -56,6 +54,8 @@ impl Pipeline {
let _ = self.font_system.get_mut().db_mut().load_font_source(
glyphon::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
);
self.cache = RefCell::new(Cache::new());
}
pub fn prepare(
@ -78,25 +78,25 @@ impl Pipeline {
let font_system = self.font_system.get_mut();
let renderer = &mut self.renderers[self.prepare_layer];
let cache = self.cache.get_mut();
let keys: Vec<_> = sections
.iter()
.map(|section| {
let (key, _) = self.render_cache.allocate(
let (key, _) = cache.allocate(
font_system,
Key {
content: section.content,
size: section.size * scale_factor,
size: section.size,
line_height: f32::from(
section
.line_height
.to_absolute(Pixels(section.size)),
) * scale_factor,
),
font: section.font,
bounds: Size {
width: (section.bounds.width * scale_factor).ceil(),
height: (section.bounds.height * scale_factor)
.ceil(),
width: section.bounds.width,
height: section.bounds.height,
},
shaping: section.shaping,
},
@ -113,14 +113,16 @@ impl Pipeline {
.iter()
.zip(keys.iter())
.filter_map(|(section, key)| {
let buffer =
self.render_cache.get(key).expect("Get cached buffer");
let (max_width, total_height) = measure(buffer);
let buffer = cache.get(key).expect("Get cached buffer");
let x = section.bounds.x * scale_factor;
let y = section.bounds.y * scale_factor;
let (max_width, total_height) = measure(buffer);
let max_width = max_width * scale_factor;
let total_height = total_height * scale_factor;
let left = match section.horizontal_alignment {
alignment::Horizontal::Left => x,
alignment::Horizontal::Center => x - max_width / 2.0,
@ -142,14 +144,11 @@ impl Pipeline {
let clip_bounds = bounds.intersection(&section_bounds)?;
// TODO: Subpixel glyph positioning
let left = left.round() as i32;
let top = top.round() as i32;
Some(glyphon::TextArea {
buffer,
left,
top,
scale: scale_factor,
bounds: glyphon::TextBounds {
left: clip_bounds.x as i32,
top: clip_bounds.y as i32,
@ -227,7 +226,7 @@ impl Pipeline {
pub fn end_frame(&mut self) {
self.atlas.trim();
self.render_cache.trim();
self.cache.get_mut().trim();
self.prepare_layer = 0;
}
@ -241,7 +240,7 @@ impl Pipeline {
bounds: Size,
shaping: Shaping,
) -> (f32, f32) {
let mut measurement_cache = self.measurement_cache.borrow_mut();
let mut measurement_cache = self.cache.borrow_mut();
let line_height = f32::from(line_height.to_absolute(Pixels(size)));
@ -271,7 +270,7 @@ impl Pipeline {
point: Point,
_nearest_only: bool,
) -> Option<Hit> {
let mut measurement_cache = self.measurement_cache.borrow_mut();
let mut measurement_cache = self.cache.borrow_mut();
let line_height = f32::from(line_height.to_absolute(Pixels(size)));
@ -291,10 +290,6 @@ impl Pipeline {
Some(Hit::CharOffset(cursor.index))
}
pub fn trim_measurement_cache(&mut self) {
self.measurement_cache.borrow_mut().trim();
}
}
fn measure(buffer: &glyphon::Buffer) -> (f32, f32) {