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

Apply scaling during Frame::fill_text in iced_tiny_skia

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-17 13:27:39 +01:00
parent 66bea7bb6d
commit 5aa741a177
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tiny_skia/src/geometry.rs
View file

@ -1,4 +1,5 @@
use crate::core::{Point, Rectangle, Size, Vector};
use crate::core::text::LineHeight;
use crate::core::{Pixels, Point, Rectangle, Size, Vector};
use crate::graphics::geometry::fill::{self, Fill};
use crate::graphics::geometry::stroke::{self, Stroke};
use crate::graphics::geometry::{Path, Style, Text};
@ -96,17 +97,32 @@ impl Frame {
pub fn fill_text(&mut self, text: impl Into<Text>) {
let text = text.into();
let position = if self.transform.is_identity() {
text.position
let (position, size, line_height) = if self.transform.is_identity() {
(text.position, text.size, text.line_height)
} else {
let mut transformed = [tiny_skia::Point {
let mut position = [tiny_skia::Point {
x: text.position.x,
y: text.position.y,
}];
self.transform.map_points(&mut transformed);
self.transform.map_points(&mut position);
Point::new(transformed[0].x, transformed[0].y)
let (_, scale_y) = self.transform.get_scale();
let size = text.size.0 * scale_y;
let line_height = match text.line_height {
LineHeight::Absolute(size) => {
LineHeight::Absolute(Pixels(size.0 * scale_y))
}
LineHeight::Relative(factor) => LineHeight::Relative(factor),
};
(
Point::new(position[0].x, position[0].y),
size.into(),
line_height,
)
};
let bounds = Rectangle {
@ -121,8 +137,8 @@ impl Frame {
content: text.content,
bounds,
color: text.color,
size: text.size,
line_height: text.line_height,
size,
line_height,
font: text.font,
horizontal_alignment: text.horizontal_alignment,
vertical_alignment: text.vertical_alignment,