mirror of
https://github.com/slint-ui/slint.git
synced 2025-08-04 18:58:36 +00:00
Enable support for WASM builds with the software renderer
Everything is already working, just had to play around with a few cfgs. The sharedfontdb module already takes care of including DejaVuSans as default fallback font.
This commit is contained in:
parent
0d2892004d
commit
20cf304936
4 changed files with 22 additions and 23 deletions
|
@ -722,7 +722,7 @@ impl RendererSealed for SoftwareRenderer {
|
|||
paragraph.byte_offset_for_position((pos.x_length(), pos.y_length())),
|
||||
)
|
||||
}
|
||||
#[cfg(all(feature = "software-renderer-systemfonts", not(target_arch = "wasm32")))]
|
||||
#[cfg(feature = "software-renderer-systemfonts")]
|
||||
fonts::Font::VectorFont(vf) => {
|
||||
let layout = fonts::text_layout_for_font(&vf, &font_request, scale_factor);
|
||||
|
||||
|
@ -777,7 +777,7 @@ impl RendererSealed for SoftwareRenderer {
|
|||
|
||||
(paragraph.cursor_pos_for_byte_offset(byte_offset), pf.height())
|
||||
}
|
||||
#[cfg(all(feature = "software-renderer-systemfonts", not(target_arch = "wasm32")))]
|
||||
#[cfg(feature = "software-renderer-systemfonts")]
|
||||
fonts::Font::VectorFont(vf) => {
|
||||
let layout = fonts::text_layout_for_font(&vf, &font_request, scale_factor);
|
||||
|
||||
|
@ -831,7 +831,7 @@ impl RendererSealed for SoftwareRenderer {
|
|||
fonts::register_bitmap_font(font_data);
|
||||
}
|
||||
|
||||
#[cfg(all(feature = "software-renderer-systemfonts", not(target_arch = "wasm32")))]
|
||||
#[cfg(feature = "software-renderer-systemfonts")]
|
||||
fn register_font_from_memory(
|
||||
&self,
|
||||
data: &'static [u8],
|
||||
|
@ -1968,7 +1968,7 @@ impl<'a, T: ProcessScene> crate::item_rendering::ItemRenderer for SceneBuilder<'
|
|||
|
||||
self.draw_text_paragraph(¶graph, physical_clip, offset, color, None);
|
||||
}
|
||||
#[cfg(all(feature = "software-renderer-systemfonts", not(target_arch = "wasm32")))]
|
||||
#[cfg(feature = "software-renderer-systemfonts")]
|
||||
fonts::Font::VectorFont(vf) => {
|
||||
let layout = fonts::text_layout_for_font(&vf, &font_request, self.scale_factor);
|
||||
let (horizontal_alignment, vertical_alignment) = text.alignment();
|
||||
|
@ -2047,7 +2047,7 @@ impl<'a, T: ProcessScene> crate::item_rendering::ItemRenderer for SceneBuilder<'
|
|||
(paragraph.cursor_pos_for_byte_offset(cursor_offset), pf.height())
|
||||
})
|
||||
}
|
||||
#[cfg(all(feature = "software-renderer-systemfonts", not(target_arch = "wasm32")))]
|
||||
#[cfg(feature = "software-renderer-systemfonts")]
|
||||
fonts::Font::VectorFont(vf) => {
|
||||
let paragraph = TextParagraphLayout {
|
||||
string: &text_visual_representation.text,
|
||||
|
@ -2229,7 +2229,7 @@ impl<'a, T: ProcessScene> crate::item_rendering::ItemRenderer for SceneBuilder<'
|
|||
|
||||
self.draw_text_paragraph(¶graph, clip, Default::default(), color, None);
|
||||
}
|
||||
#[cfg(all(feature = "software-renderer-systemfonts", not(target_arch = "wasm32")))]
|
||||
#[cfg(feature = "software-renderer-systemfonts")]
|
||||
fonts::Font::VectorFont(vf) => {
|
||||
let layout = fonts::text_layout_for_font(&vf, &font_request, self.scale_factor);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue