diff --git a/apps/mtxcli/Cargo.toml b/apps/mtxcli/Cargo.toml index 40ac4073e..c11073cd8 100644 --- a/apps/mtxcli/Cargo.toml +++ b/apps/mtxcli/Cargo.toml @@ -16,7 +16,8 @@ log-server = { package = "xous-api-log", version = "0.1.63" } ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.63" } xous-names = { package = "xous-api-names", version = "0.9.65" } gam = { path = "../../services/gam" } -graphics-server = { path = "../../services/graphics-server" } +ux-api = { path = "../../libs/ux-api" } +blitstr2 = { path = "../../libs/blitstr2" } trng = { path = "../../services/trng" } locales = { path = "../../locales" } ime-plugin-api = { path = "../../services/ime-plugin-api" } diff --git a/apps/mtxcli/src/mtxcli.rs b/apps/mtxcli/src/mtxcli.rs index b6d61fe12..696c5e2ea 100644 --- a/apps/mtxcli/src/mtxcli.rs +++ b/apps/mtxcli/src/mtxcli.rs @@ -1,9 +1,10 @@ use core::fmt::Write; +use blitstr2::GlyphStyle; use gam::UxRegistration; -use graphics_server::api::GlyphStyle; -use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView}; use locales::t; +use ux_api::minigfx::*; +use ux_api::service::api::*; use xous::MessageEnvelope; use super::*; @@ -35,7 +36,7 @@ pub(crate) struct Mtxcli { margin: Point, // margin to edge of canvas bubble_margin: Point, // margin of text in bubbles bubble_radius: u16, - bubble_space: i16, // spacing between text bubbles + bubble_space: isize, // spacing between text bubbles // command environment env: CmdEnv,