diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index 84f6583f8..54ac2921d 100644 --- a/services/gam/Cargo.toml +++ b/services/gam/Cargo.toml @@ -20,6 +20,7 @@ trng = { path = "../trng", optional = true } xous = "0.9.64" xous-ipc = "0.10.4" xous-names = { package = "xous-api-names", version = "0.9.65" } +blitstr2 = { path = "../../libs/blitstr2" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/gam/src/layouts/chat.rs b/services/gam/src/layouts/chat.rs index 7bb869c30..bd6569d77 100644 --- a/services/gam/src/layouts/chat.rs +++ b/services/gam/src/layouts/chat.rs @@ -1,11 +1,12 @@ use std::collections::HashMap; +use blitstr2::GlyphStyle; #[cfg(feature = "cramium-soc")] use cram_hal_service::trng; use graphics_server::*; +use crate::Canvas; use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST; -use crate::{Canvas, GlyphStyle}; use crate::{LayoutApi, LayoutBehavior}; const TRUST_OFFSET: u8 = 2; diff --git a/services/gam/src/lib.rs b/services/gam/src/lib.rs index aa1fe9897..32181bad9 100644 --- a/services/gam/src/lib.rs +++ b/services/gam/src/lib.rs @@ -15,7 +15,7 @@ pub mod bitmap; use api::Opcode; // if you prefer to map the api into your local namespace #[cfg(feature = "ditherpunk")] pub use bitmap::{Bitmap, DecodePng, Img, PixelType}; -pub use graphics_server::api::GlyphStyle; +pub use blitstr2::GlyphStyle; pub use graphics_server::api::PixelColor; #[cfg(feature = "ditherpunk")] pub use graphics_server::api::Tile; diff --git a/services/gam/src/main.rs b/services/gam/src/main.rs index 973fa7053..274f67f10 100644 --- a/services/gam/src/main.rs +++ b/services/gam/src/main.rs @@ -15,6 +15,7 @@ use core::sync::atomic::{AtomicU32, Ordering}; use std::collections::HashMap; use api::Opcode; +use blitstr2::GlyphStyle; #[cfg(feature = "cramium-soc")] use cram_hal_service::trng; use gam::{MAIN_MENU_NAME, ROOTKEY_MODAL_NAME}; diff --git a/services/gam/src/modal.rs b/services/gam/src/modal.rs index 993b3b726..0d0ef2d59 100644 --- a/services/gam/src/modal.rs +++ b/services/gam/src/modal.rs @@ -22,8 +22,8 @@ mod bip39entry; use core::fmt::Write; pub use bip39entry::*; +pub use blitstr2::GlyphStyle; use enum_dispatch::enum_dispatch; -pub use graphics_server::api::GlyphStyle; use graphics_server::api::*; use num_traits::*; use xous_ipc::Buffer; diff --git a/services/gam/src/modal/bip39entry.rs b/services/gam/src/modal/bip39entry.rs index 67262bbf0..6112467d6 100644 --- a/services/gam/src/modal/bip39entry.rs +++ b/services/gam/src/modal/bip39entry.rs @@ -2,7 +2,7 @@ use core::cell::Cell; use core::fmt::Write; use std::string::String; -use glyphstyle::GlyphStyle; +use blitstr2::{GlyphStyle, glyph_to_height_hint}; use graphics_server::api::*; use locales::t; use xous_ipc::Buffer; diff --git a/services/gam/src/modal/progressbar.rs b/services/gam/src/modal/progressbar.rs index 8250f90e1..dc284a08a 100644 --- a/services/gam/src/modal/progressbar.rs +++ b/services/gam/src/modal/progressbar.rs @@ -1,4 +1,4 @@ -use graphics_server::api::GlyphStyle; +use blitstr2::GlyphStyle; use crate::*; diff --git a/services/gam/src/modal/textentry.rs b/services/gam/src/modal/textentry.rs index 98176f7ee..bf26a55e1 100644 --- a/services/gam/src/modal/textentry.rs +++ b/services/gam/src/modal/textentry.rs @@ -2,7 +2,7 @@ use core::cell::Cell; use core::fmt::Write; use std::cell::RefCell; -use graphics_server::api::GlyphStyle; +use blitstr2::*; use graphics_server::api::*; use num_traits::*; use xous_ipc::Buffer;