From fed5191e188f346e567aa1ce7bb381b40e8f9c19 Mon Sep 17 00:00:00 2001 From: cepetr Date: Fri, 15 Mar 2024 08:12:51 +0100 Subject: [PATCH] fixup! WIP - replace painter by jpeg and bar components --- core/embed/rust/src/ui/component/jpeg.rs | 1 - core/embed/rust/src/ui/component/mod.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/embed/rust/src/ui/component/jpeg.rs b/core/embed/rust/src/ui/component/jpeg.rs index 4e4cf5dee9..89903aa8d1 100644 --- a/core/embed/rust/src/ui/component/jpeg.rs +++ b/core/embed/rust/src/ui/component/jpeg.rs @@ -1,5 +1,4 @@ use crate::error::Error; -#[cfg(feature = "jpeg")] use crate::micropython::{buffer::get_buffer, obj::Obj}; use crate::ui::{ diff --git a/core/embed/rust/src/ui/component/mod.rs b/core/embed/rust/src/ui/component/mod.rs index 092dc3f298..0859d68585 100644 --- a/core/embed/rust/src/ui/component/mod.rs +++ b/core/embed/rust/src/ui/component/mod.rs @@ -6,7 +6,7 @@ pub mod border; pub mod connect; pub mod empty; pub mod image; -#[cfg(feature = "jpeg")] +#[cfg(all(feature = "jpeg", feature = "micropython"))] pub mod jpeg; pub mod label; pub mod map; @@ -23,7 +23,7 @@ pub use bar::Bar; pub use base::{Child, Component, ComponentExt, Event, EventCtx, Never, Root, TimerToken}; pub use border::Border; pub use empty::Empty; -#[cfg(feature = "jpeg")] +#[cfg(all(feature = "jpeg", feature = "micropython"))] pub use jpeg::Jpeg; pub use label::Label; pub use map::MsgMap;