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

Introduce support for Font attributes

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-03-30 00:56:00 +02:00
parent 472fbdf187
commit 707de9d788
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
15 changed files with 129 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wgpu/src/backend.rs
View file

@ -336,7 +336,7 @@ impl iced_graphics::Backend for Backend {
}
impl backend::Text for Backend {
const ICON_FONT: Font = Font::Name("Iced-Icons");
const ICON_FONT: Font = Font::with_name("Iced-Icons");
const CHECKMARK_ICON: char = '\u{f00c}';
const ARROW_DOWN_ICON: char = '\u{e800}';

2
wgpu/src/layer.rs
View file

@ -61,7 +61,7 @@ impl<'a> Layer<'a> {
),
color: Color::new(0.9, 0.9, 0.9, 1.0),
size: 20.0,
font: Font::Monospace,
font: Font::MONOSPACE,
horizontal_alignment: alignment::Horizontal::Left,
vertical_alignment: alignment::Vertical::Top,
};

2
wgpu/src/settings.rs
View file

@ -58,7 +58,7 @@ impl Default for Settings {
Settings {
present_mode: wgpu::PresentMode::AutoVsync,
internal_backend: wgpu::Backends::all(),
default_font: Font::SansSerif,
default_font: Font::default(),
default_text_size: 16.0,
antialiasing: None,
}

44
wgpu/src/text.rs
View file

@ -1,6 +1,7 @@
use crate::core::alignment;
use crate::core::font::{self, Font};
use crate::core::text::Hit;
use crate::core::{Font, Point, Rectangle, Size};
use crate::core::{Point, Rectangle, Size};
use crate::layer::Text;
use rustc_hash::{FxHashMap, FxHashSet};
@ -262,14 +263,28 @@ impl Pipeline {
}
}
fn to_family(font: Font) -> glyphon::Family<'static> {
match font {
Font::Name(name) => glyphon::Family::Name(name),
Font::SansSerif => glyphon::Family::SansSerif,
Font::Serif => glyphon::Family::Serif,
Font::Cursive => glyphon::Family::Cursive,
Font::Fantasy => glyphon::Family::Fantasy,
Font::Monospace => glyphon::Family::Monospace,
fn to_family(family: font::Family) -> glyphon::Family<'static> {
match family {
font::Family::Name(name) => glyphon::Family::Name(name),
font::Family::SansSerif => glyphon::Family::SansSerif,
font::Family::Serif => glyphon::Family::Serif,
font::Family::Cursive => glyphon::Family::Cursive,
font::Family::Fantasy => glyphon::Family::Fantasy,
font::Family::Monospace => glyphon::Family::Monospace,
}
}
fn to_weight(weight: font::Weight) -> glyphon::Weight {
match weight {
font::Weight::Thin => glyphon::Weight::THIN,
font::Weight::ExtraLight => glyphon::Weight::EXTRA_LIGHT,
font::Weight::Light => glyphon::Weight::LIGHT,
font::Weight::Normal => glyphon::Weight::NORMAL,
font::Weight::Medium => glyphon::Weight::MEDIUM,
font::Weight::Semibold => glyphon::Weight::SEMIBOLD,
font::Weight::Bold => glyphon::Weight::BOLD,
font::Weight::ExtraBold => glyphon::Weight::EXTRA_BOLD,
font::Weight::Black => glyphon::Weight::BLACK,
}
}
@ -328,8 +343,15 @@ impl Cache {
font_system,
key.content,
glyphon::Attrs::new()
.family(to_family(key.font))
.monospaced(matches!(key.font, Font::Monospace)),
.family(to_family(key.font.family))
.weight(to_weight(key.font.weight))
.monospaced(
key.font.monospaced
|| matches!(
key.font.family,
font::Family::Monospace
),
),
);
let _ = entry.insert(buffer);