mirror of
https://github.com/slint-ui/slint.git
synced 2025-08-02 18:03:07 +00:00
f912ec7e6b
The code was mixing logical and physical sizes, causing glyphs being doubly scaled down. Instead, this patch introduces: * Physical* and Logical* euclid length/size/rect aliases * some extraction traits for getting the scalars in rects/sizes as lengths (until euclid has them built-in) * wrapper traits/types for safely extracting the physical font metrics the compiler generates (i16) * Fix a bug in the text height calculation where we failed to take the descent into account
95 lines
2.3 KiB
Rust
95 lines
2.3 KiB
Rust
// Copyright © SixtyFPS GmbH <info@slint-ui.com>
|
|
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
pub use tiny_skia::IntRect as Rect;
|
|
|
|
#[derive(Debug, Clone, Copy, Default)]
|
|
pub struct Size {
|
|
pub width: u32,
|
|
pub height: u32,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub enum PixelFormat {
|
|
// 24 bit RGB
|
|
Rgb,
|
|
// 32 bit RGBA
|
|
Rgba,
|
|
// 8bit alpha map with a given color
|
|
AlphaMap([u8; 3]),
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
#[derive(Debug, Clone)]
|
|
pub struct Texture {
|
|
pub total_size: Size,
|
|
pub rect: Rect,
|
|
pub data: Vec<u8>,
|
|
pub format: PixelFormat,
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
impl Texture {
|
|
pub fn new_empty() -> Self {
|
|
Self {
|
|
total_size: Size::default(),
|
|
rect: Rect::from_xywh(0, 0, 1, 1).unwrap(),
|
|
data: vec![0, 0, 0, 0],
|
|
format: PixelFormat::Rgba,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct BitmapGlyph {
|
|
pub x: i16,
|
|
pub y: i16,
|
|
pub width: i16,
|
|
pub height: i16,
|
|
pub x_advance: i16,
|
|
pub data: Vec<u8>, // 8bit alpha map
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
#[derive(Debug, Clone)]
|
|
pub struct BitmapGlyphs {
|
|
pub pixel_size: i16,
|
|
pub glyph_data: Vec<BitmapGlyph>,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct CharacterMapEntry {
|
|
pub code_point: char,
|
|
pub glyph_index: u16,
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
#[derive(Debug, Clone)]
|
|
pub struct BitmapFont {
|
|
pub family_name: String,
|
|
pub character_map: Vec<CharacterMapEntry>, // map of available glyphs, sorted by char
|
|
pub units_per_em: f32,
|
|
pub ascent: f32,
|
|
pub descent: f32,
|
|
pub glyphs: Vec<BitmapGlyphs>,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub enum EmbeddedResourcesKind {
|
|
/// Just put the file content as a resource
|
|
RawData,
|
|
/// The data has been processed in a texture
|
|
TextureData(#[cfg(not(target_arch = "wasm32"))] Texture),
|
|
/// A set of pre-rendered glyphs of a TrueType font
|
|
BitmapFontData(#[cfg(not(target_arch = "wasm32"))] BitmapFont),
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct EmbeddedResources {
|
|
/// unique integer id, that can be used by the generator for symbol generation.
|
|
pub id: usize,
|
|
|
|
pub kind: EmbeddedResourcesKind,
|
|
}
|