fixup! refactor(core/rust): make use of Display trait for rendering

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

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/core/embed/rust/src/ui/component/cached_jpeg.rs b/core/embed/rust/src/ui/component/cached_jpeg.rs
@@ -31,7 +31,7 @@ impl CachedJpeg {
 
  let mut buf = unwrap!(ImageBuffer::new(size), "no image buf");
 
- render_on_canvas(buf.canvas(), None, |target| {
+ render_on_canvas!(buf.canvas(), None, |target| {
  shape::JpegImage::new_image(Point::zero(), image)
  .with_scale(scale)
  .render(target);

diff --git a/core/embed/rust/src/ui/flow/swipe.rs b/core/embed/rust/src/ui/flow/swipe.rs
@@ -16,10 +16,8 @@ use crate::{
  flow::{base::Decision, FlowMsg, FlowState},
  geometry::Rect,
  layout::obj::ObjComponent,
- model_mercury::ModelMercuryFeatures,
- shape::{render_on_display, Display, Renderer},
+ shape::{render_on_display, Display},
  util::animation_disabled,
- UIFeaturesCommon,
  },
 };
 

diff --git a/core/embed/rust/src/ui/model_mercury/component/homescreen.rs b/core/embed/rust/src/ui/model_mercury/component/homescreen.rs
@@ -441,7 +441,7 @@ impl Homescreen {
  let image = get_homescreen_image();
  let mut buf = unwrap!(ImageBuffer::new(AREA.size()), "no image buf");
 
- render_on_canvas(buf.canvas(), None, |target| {
+ render_on_canvas!(buf.canvas(), None, |target| {
  if let Some(image) = image {
  shape::JpegImage::new_image(Point::zero(), image).render(target);
  } else {
@@ -735,7 +735,7 @@ impl Lockscreen {
  let image = get_homescreen_image();
  let mut buf = unwrap!(ImageBuffer::new(AREA.size()), "no image buf");
 
- render_on_canvas(buf.canvas(), None, |target| {
+ render_on_canvas!(buf.canvas(), None, |target| {
  if let Some(image) = image {
  shape::JpegImage::new_image(Point::zero(), image).render(target);
  } else {