shellchat: use platform-neutral ux-api instead of graphics-server

This commit is contained in:
bunnie 2025-02-21 17:48:38 +08:00
parent 931cf8f945
commit 9cbe4a9721
3 changed files with 7 additions and 6 deletions

View file

@ -11,7 +11,7 @@ com = { path = "../com" }
content-plugin-api = { path = "../content-plugin-api" } # all content canvas providers must provide this API
gam = { path = "../gam" }
blitstr2 = { path = "../../libs/blitstr2" }
graphics-server = { path = "../graphics-server" }
ux-api = { path = "../../libs/ux-api" }
ime-plugin-api = { path = "../ime-plugin-api" }
ime-plugin-shell = { path = "../ime-plugin-shell" }
ime-plugin-tts = { path = "../ime-plugin-tts" }

View file

@ -457,9 +457,9 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
log::info!("heap size: {}", heap_usage());
let mut png = DecodePng::new(reader).expect("png decode failed");
const BORDER: u32 = 3;
let modal_size = gam::Point::new(
(gam::IMG_MODAL_WIDTH - 2 * BORDER) as i16,
(gam::IMG_MODAL_HEIGHT - 2 * BORDER) as i16,
let modal_size = ux_api::minigfx::Point::new(
(gam::IMG_MODAL_WIDTH - 2 * BORDER) as isize,
(gam::IMG_MODAL_HEIGHT - 2 * BORDER) as isize,
);
let bm = gam::Bitmap::from_png(&mut png, Some(modal_size));

View file

@ -35,8 +35,9 @@ use std::sync::Arc;
use std::thread;
use gam::UxRegistration;
use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView};
use log::info;
use ux_api::minigfx::*;
use ux_api::service::api::*;
use xous::MessageEnvelope;
use xous_ipc::Buffer;
@ -138,7 +139,7 @@ struct Repl {
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,