diff --git a/showbits-assets/data/unifont_jp-15.1.05.otf b/showbits-assets/data/unifont_jp-15.1.05.otf new file mode 100644 index 0000000..51cff50 Binary files /dev/null and b/showbits-assets/data/unifont_jp-15.1.05.otf differ diff --git a/showbits-assets/data/unifont_upper-15.1.05.otf b/showbits-assets/data/unifont_upper-15.1.05.otf new file mode 100644 index 0000000..a424bb7 Binary files /dev/null and b/showbits-assets/data/unifont_upper-15.1.05.otf differ diff --git a/showbits-assets/src/lib.rs b/showbits-assets/src/lib.rs index 7890ee7..345dfe0 100644 --- a/showbits-assets/src/lib.rs +++ b/showbits-assets/src/lib.rs @@ -1,3 +1,5 @@ pub const UNIFONT: &[u8] = include_bytes!("../data/unifont-15.1.05.otf"); +pub const UNIFONT_JP: &[u8] = include_bytes!("../data/unifont_jp-15.1.05.otf"); +pub const UNIFONT_UPPER: &[u8] = include_bytes!("../data/unifont_upper-15.1.05.otf"); pub const UNIFONT_NAME: &str = "Unifont"; pub const UNIFONT_SIZE: f32 = 16.0; diff --git a/showbits-common/src/widgets/text.rs b/showbits-common/src/widgets/text.rs index 376bbf6..66f5f33 100644 --- a/showbits-common/src/widgets/text.rs +++ b/showbits-common/src/widgets/text.rs @@ -1,6 +1,6 @@ use cosmic_text::{Attrs, AttrsOwned, Buffer, Family, FontSystem, Metrics, Shaping, SwashCache}; use palette::Srgba; -use showbits_assets::{UNIFONT, UNIFONT_NAME, UNIFONT_SIZE}; +use showbits_assets::{UNIFONT, UNIFONT_JP, UNIFONT_NAME, UNIFONT_SIZE, UNIFONT_UPPER}; use taffy::{ prelude::{AvailableSpace, Size}, Layout, @@ -20,6 +20,8 @@ impl FontStuff { let mut font_system = FontSystem::new(); let db = font_system.db_mut(); db.load_font_data(UNIFONT.to_vec()); + db.load_font_data(UNIFONT_JP.to_vec()); + db.load_font_data(UNIFONT_UPPER.to_vec()); db.set_monospace_family(UNIFONT_NAME); Self { @@ -61,7 +63,7 @@ impl Text { metrics: Self::default_metrics(), default_attrs: AttrsOwned::new(Self::default_attrs()), chunks: vec![], - shaping: Shaping::Basic, + shaping: Shaping::Advanced, color: color::BLACK, } }