diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 79aadebd0..d4efa8aec 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -31,7 +31,7 @@ codec = { path = "../codec" } userprefs = { path = "../../libs/userprefs" } dns = { path = "../dns" } early_settings = { path = "../early_settings" } - +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/status/src/main.rs b/services/status/src/main.rs index a660c8c7f..1d557f3a4 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -19,11 +19,11 @@ use std::sync::{Arc, Mutex}; #[cfg_attr(not(target_os = "xous"), allow(unused_imports))] use std::thread; +use blitstr2::GlyphStyle; use chrono::prelude::*; use com::api::*; use crossbeam::channel::{Receiver, Sender, at, select, unbounded}; use gam::{GamObjectList, GamObjectType}; -use graphics_server::api::GlyphStyle; use graphics_server::*; use locales::t; use num_traits::*; diff --git a/services/status/src/wifi.rs b/services/status/src/wifi.rs index 1a04b8557..58d6d8bf7 100644 --- a/services/status/src/wifi.rs +++ b/services/status/src/wifi.rs @@ -244,8 +244,8 @@ impl WLANMan { networks.retain(|&n| n.len() != 0); // limit the total number displayed so that the "okay" button does not disappear off the bottom let max_entries = match gam::SYSTEM_STYLE { - graphics_server::GlyphStyle::Tall => 13, - graphics_server::GlyphStyle::Regular => 16, + blitstr2::GlyphStyle::Tall => 13, + blitstr2::GlyphStyle::Regular => 16, _ => 12, }; networks.truncate(max_entries);