fix(core/rust): fix build with old rendering

trezor · Aug 28, 2024 · 6acc529 · 6acc529
1 parent 155c3b2
commit 6acc529
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/core/embed/rust/src/ui/model_tr/mod.rs b/core/embed/rust/src/ui/model_tr/mod.rs
@@ -1,4 +1,4 @@
-use super::{geometry::Rect, shape::display::fb_display, UIFeaturesCommon};
+use super::{geometry::Rect, UIFeaturesCommon};
 
 #[cfg(feature = "bootloader")]
 pub mod bootloader;
@@ -14,7 +14,8 @@ pub mod theme;
 pub struct ModelTRFeatures {}
 
 impl UIFeaturesCommon for ModelTRFeatures {
- type Display = fb_display::Mono8;
+ #[cfg(feature = "new_rendering")]
+ type Display = crate::ui::shape::display::fb_display::Mono8;
 
  const SCREEN: Rect = constant::SCREEN;
 

diff --git a/core/embed/rust/src/ui/model_tt/mod.rs b/core/embed/rust/src/ui/model_tt/mod.rs
@@ -1,4 +1,4 @@
-use super::{geometry::Rect, shape::display::nofb_rgb565::NoFbRgb565, UIFeaturesCommon};
+use super::{geometry::Rect, UIFeaturesCommon};
 
 #[cfg(feature = "bootloader")]
 pub mod bootloader;
@@ -20,7 +20,8 @@ use crate::ui::{
 pub struct ModelTTFeatures;
 
 impl UIFeaturesCommon for ModelTTFeatures {
- type Display = NoFbRgb565;
+ #[cfg(feature = "new_rendering")]
+ type Display = crate::ui::shape::display::nofb_rgb565::NoFbRgb565;
 
  #[cfg(feature = "backlight")]
  fn fadein() {

diff --git a/core/embed/rust/src/ui/ui_features.rs b/core/embed/rust/src/ui/ui_features.rs
@@ -7,6 +7,7 @@ use crate::trezorhal::secbool::secbool;
 use crate::ui::display::Color;
 
 pub trait UIFeaturesCommon {
+ #[cfg(feature = "new_rendering")]
  type Display: Display;
 
  fn fadein() {}