Draw proper checkmark for Checkbox in iced_wgpu
This commit is contained in:
parent
66bb2f7cbf
commit
2c8ba652a7
4 changed files with 20 additions and 12 deletions
|
|
@ -357,7 +357,7 @@ fn empty_message(message: &str) -> Element<'static, Message> {
|
|||
// Fonts
|
||||
const ICONS: Font = Font::External {
|
||||
name: "Icons",
|
||||
bytes: include_bytes!("./resources/icons.ttf"),
|
||||
bytes: include_bytes!("resources/icons.ttf"),
|
||||
};
|
||||
|
||||
fn icon(unicode: char) -> Text {
|
||||
|
|
|
|||
|
|
@ -74,14 +74,15 @@ impl checkbox::Renderer for Renderer {
|
|||
(
|
||||
Primitive::Group {
|
||||
primitives: if checkbox.is_checked {
|
||||
// TODO: Draw an actual icon
|
||||
let (check, _) = text::Renderer::draw(
|
||||
self,
|
||||
&Text::new("X")
|
||||
.horizontal_alignment(HorizontalAlignment::Center)
|
||||
.vertical_alignment(VerticalAlignment::Center),
|
||||
checkbox_layout,
|
||||
);
|
||||
let check = Primitive::Text {
|
||||
content: crate::text::CHECKMARK_ICON.to_string(),
|
||||
font: crate::text::BUILTIN_ICONS,
|
||||
size: checkbox_bounds.height * 0.7,
|
||||
bounds: checkbox_bounds,
|
||||
color: [0.3, 0.3, 0.3].into(),
|
||||
horizontal_alignment: HorizontalAlignment::Center,
|
||||
vertical_alignment: VerticalAlignment::Center,
|
||||
};
|
||||
|
||||
vec![checkbox_border, checkbox_box, check, label]
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,13 @@ use crate::Transformation;
|
|||
use std::cell::RefCell;
|
||||
use std::collections::HashMap;
|
||||
|
||||
pub const BUILTIN_ICONS: iced_native::Font = iced_native::Font::External {
|
||||
name: "iced_wgpu icons",
|
||||
bytes: include_bytes!("text/icons.ttf"),
|
||||
};
|
||||
|
||||
pub const CHECKMARK_ICON: char = '\u{F00C}';
|
||||
|
||||
pub struct Pipeline {
|
||||
draw_brush: RefCell<wgpu_glyph::GlyphBrush<'static, ()>>,
|
||||
draw_font_map: RefCell<HashMap<String, wgpu_glyph::FontId>>,
|
||||
|
|
@ -91,10 +98,10 @@ impl Pipeline {
|
|||
|
||||
// TODO: This is a bit hacky. We are loading the debug font as the
|
||||
// first font in the `draw_brush`. The `measure_brush` does not
|
||||
// contain this font, hence we subtract 1.
|
||||
// contain this, hence we subtract 1.
|
||||
//
|
||||
// This should go away once we improve the debug view and integrate
|
||||
// it as just another UI app.
|
||||
// This should go away once we unify `draw_brush` and
|
||||
// `measure_brush`.
|
||||
font_id: wgpu_glyph::FontId(font_id - 1),
|
||||
..Default::default()
|
||||
};
|
||||
|
|
|
|||
BIN
wgpu/src/text/icons.ttf
Normal file
BIN
wgpu/src/text/icons.ttf
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue