Merge 6ba20cc309 into 52f5593f28

core/embed/rust/src/ui/api/firmware_micropython.rs

@@ -319,9 +319,13 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
     let block = move |_args: &[Obj], kwargs: &Map| {
         let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
+        let subtitle: Option<TString> = kwargs
+            .get(Qstr::MP_QSTR_subtitle)
+            .and_then(Obj::try_into_option)
+            .unwrap_or(None);
         let hold: bool = kwargs.get_or(Qstr::MP_QSTR_hold, false)?;
 
-        let layout = ModelUI::confirm_properties(title, items, hold)?;
+        let layout = ModelUI::confirm_properties(title, subtitle, items, hold)?;
         Ok(LayoutObj::new_root(layout)?.into())
     };
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
@@ -1302,6 +1306,7 @@ pub static mp_module_trezorui_api: Module = obj_module! {
     ///     *,
     ///     title: str,
     ///     items: list[tuple[str | None, str | bytes | None, bool]],
+    ///     subtitle: str | None = None,
     ///     hold: bool = False,
     /// ) -> LayoutObj[UiResult]:
     ///     """Confirm list of key-value pairs. The third component in the tuple should be True if

core/embed/rust/src/ui/component/label.rs

@@ -111,7 +111,7 @@ impl<'a> Label<'a> {
 
     pub fn render_with_alpha<'s>(&self, target: &mut impl Renderer<'s>, alpha: u8) {
         self.text
-            .map(|c| self.layout.render_text_with_alpha(c, target, alpha));
+            .map(|c| self.layout.render_text_with_alpha(c, target, alpha, true));
     }
 }
 
@@ -137,7 +137,7 @@ impl Component for Label<'_> {
     }
 
     fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
-        self.text.map(|c| self.layout.render_text(c, target));
+        self.text.map(|c| self.layout.render_text(c, target, true));
     }
 }
 

core/embed/rust/src/ui/component/text/layout.rs

@@ -232,21 +232,34 @@ impl TextLayout {
     }
 
     /// Draw as much text as possible on the current screen.
-    pub fn render_text<'s>(&self, text: &str, target: &mut impl Renderer<'s>) -> LayoutFit {
-        self.render_text_with_alpha(text, target, 255)
+    pub fn render_text<'s>(
+        &self,
+        text: &str,
+        target: &mut impl Renderer<'s>,
+        must_fit: bool,
+    ) -> LayoutFit {
+        self.render_text_with_alpha(text, target, 255, must_fit)
     }
+
     /// Draw as much text as possible on the current screen.
     pub fn render_text_with_alpha<'s>(
         &self,
         text: &str,
         target: &mut impl Renderer<'s>,
         alpha: u8,
+        must_fit: bool,
     ) -> LayoutFit {
-        self.layout_text(
+        let fit = self.layout_text(
             text,
             &mut self.initial_cursor(),
             &mut TextRenderer::new(target).with_alpha(alpha),
-        )
+        );
+
+        if must_fit && matches!(fit, LayoutFit::OutOfBounds { .. }) {
+            target.raise_overflow_exception();
+        }
+
+        fit
     }
 
     /// Loop through the `text` and try to fit it on the current screen,

core/embed/rust/src/ui/component/text/paragraphs.rs

@@ -236,7 +236,7 @@ where
             &self.visible,
             self.offset,
             &mut |layout, content| {
-                layout.render_text(content, target);
+                layout.render_text(content, target, false);
             },
         )
     }

core/embed/rust/src/ui/component/text/util.rs

@@ -32,7 +32,7 @@ pub fn text_multiline<'s>(
     let text_layout = TextLayout::new(text_style)
         .with_bounds(area)
         .with_align(alignment);
-    let layout_fit = text.map(|t| text_layout.render_text(t, target));
+    let layout_fit = text.map(|t| text_layout.render_text(t, target, false));
     match layout_fit {
         LayoutFit::Fitting { height, .. } => Some(area.split_top(height).1),
         LayoutFit::OutOfBounds { .. } => None,
@@ -60,11 +60,11 @@ pub fn text_multiline_bottom<'s>(
         LayoutFit::Fitting { height, .. } => {
             let (top, bottom) = area.split_bottom(height);
             text_layout = text_layout.with_bounds(bottom);
-            text_layout.render_text(t, target);
+            text_layout.render_text(t, target, false);
             Some(top)
         }
         LayoutFit::OutOfBounds { .. } => {
-            text_layout.render_text(t, target);
+            text_layout.render_text(t, target, false);
             None
         }
     })

core/embed/rust/src/ui/flow/swipe.rs

@@ -313,10 +313,20 @@ impl Layout<Result<Obj, Error>> for SwipeFlow {
         self.returned_value.as_ref()
     }
 
-    fn paint(&mut self) {
+    fn paint(&mut self) -> Result<(), Error> {
+        let mut invalid: bool = false;
         render_on_display(None, Some(Color::black()), |target| {
             self.render_state(self.state.index(), target);
+            if target.should_raise_overflow_exception() {
+                invalid = true;
+            }
         });
+
+        if invalid {
+            Err(Error::OutOfRange)
+        } else {
+            Ok(())
+        }
     }
 }
 

core/embed/rust/src/ui/layout/base.rs

@@ -3,6 +3,8 @@ use crate::ui::{
     component::{base::AttachType, Event, EventCtx},
 };
 
+use crate::error::Error;
+
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum LayoutState {
     Initial,
@@ -15,7 +17,7 @@ pub trait Layout<T> {
     fn place(&mut self);
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<LayoutState>;
     fn value(&self) -> Option<&T>;
-    fn paint(&mut self);
+    fn paint(&mut self) -> Result<(), Error>;
 }
 
 #[cfg(feature = "micropython")]

core/embed/rust/src/ui/layout/obj.rs

@@ -148,10 +148,12 @@ where
         self.returned_value.as_ref()
     }
 
-    fn paint(&mut self) {
+    fn paint(&mut self) -> Result<(), Error> {
         render_on_display(None, Some(Color::black()), |target| {
             self.inner.render(target);
         });
+
+        Ok(())
     }
 }
 
@@ -307,15 +309,18 @@ impl LayoutObjInner {
 
     /// Run a paint pass over the component tree. Returns true if any component
     /// actually requested painting since last invocation of the function.
-    fn obj_paint_if_requested(&mut self) -> bool {
+    fn obj_paint_if_requested(&mut self) -> Result<bool, Error> {
         display::sync();
 
         if self.repaint != Repaint::None {
             self.repaint = Repaint::None;
-            self.root_mut().paint();
-            true
+            if self.root_mut().paint().is_err() {
+                Err(Error::OutOfRange)
+            } else {
+                Ok(true)
+            }
         } else {
-            false
+            Ok(false)
         }
     }
 
@@ -603,8 +608,10 @@ extern "C" fn ui_layout_timer(this: Obj, token: Obj) -> Obj {
 extern "C" fn ui_layout_paint(this: Obj) -> Obj {
     let block = || {
         let this: Gc<LayoutObj> = this.try_into()?;
-        let painted = this.inner_mut().obj_paint_if_requested().into();
-        Ok(painted)
+        let Ok(painted) = this.inner_mut().obj_paint_if_requested() else {
+            return Err(Error::OutOfRange);
+        };
+        Ok(painted.into())
     };
     unsafe { util::try_or_raise(block) }
 }

core/embed/rust/src/ui/layout_bolt/ui_firmware.rs

@@ -375,6 +375,7 @@ impl FirmwareUI for UIBolt {
 
     fn confirm_properties(
         title: TString<'static>,
+        _subtitle: Option<TString<'static>>,
         items: Obj,
         hold: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {

core/embed/rust/src/ui/layout_caesar/ui_firmware.rs

@@ -413,6 +413,7 @@ impl FirmwareUI for UICaesar {
 
     fn confirm_properties(
         title: TString<'static>,
+        _subtitle: Option<TString<'static>>,
         items: Obj,
         hold: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {

core/embed/rust/src/ui/layout_delizia/component/frame.rs

@@ -402,13 +402,11 @@ fn frame_place(
     bounds: Rect,
     margin: usize,
 ) -> Rect {
-    let (mut header_area, mut content_area) = bounds.split_top(TITLE_HEIGHT);
-    content_area = content_area
+    let header_area = header.place(bounds);
+    let mut content_area = bounds
+        .inset(Insets::top(header_area.height().max(TITLE_HEIGHT)))
         .inset(Insets::top(theme::SPACING))
         .inset(Insets::top(margin as i16));
-    header_area = header_area.inset(Insets::sides(theme::SPACING));
-
-    header.place(header_area);
 
     if let Some(footer) = footer {
         // FIXME: spacer at the bottom might be applied also for usage without footer

core/embed/rust/src/ui/layout_delizia/component/header.rs

@@ -93,7 +93,7 @@ impl Header {
     pub const fn new(alignment: Alignment, title: TString<'static>) -> Self {
         Self {
             area: Rect::zero(),
-            title: Label::new(title, alignment, theme::label_title_main()).vertically_centered(),
+            title: Label::new(title, alignment, theme::label_title_main()),
             subtitle: None,
             button: None,
             anim: None,
@@ -185,23 +185,29 @@ impl Component for Header {
 
     fn place(&mut self, bounds: Rect) -> Rect {
         let header_area = if let Some(b) = &mut self.button {
-            let (rest, button_area) = bounds.split_right(TITLE_HEIGHT);
+            let (rest, button_area) = bounds.split_right(TITLE_HEIGHT + theme::SPACING * 2);
+            let (button_area, _under_button_area) = button_area.split_top(TITLE_HEIGHT);
             b.place(button_area);
             rest
         } else {
             bounds
-        };
+        }
+        .inset(Insets::sides(theme::SPACING));
 
         if self.subtitle.is_some() {
             let title_area = self.title.place(header_area);
             let remaining = header_area.inset(Insets::top(title_area.height()));
-            let _subtitle_area = self.subtitle.place(remaining);
+            let subtitle_area = self.subtitle.place(remaining);
+            self.area = title_area.outset(Insets::top(subtitle_area.height()));
         } else {
-            self.title.place(header_area);
-        }
+            let title_area = self.title.place(header_area);
+            if title_area.height() < header_area.height() / 10 {
+                self.title
+                    .place(title_area.translate(Offset::y(title_area.height() / 2)));
+            }
+        };
 
-        self.area = bounds;
-        bounds
+        self.area
     }
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
@@ -238,7 +244,7 @@ impl Component for Header {
 
         self.button.render(target);
 
-        target.in_clip(self.area.split_left(offset.x).0, &|target| {
+        target.in_clip(self.title.area().split_left(offset.x).0, &|target| {
             if let Some(icon) = self.icon {
                 let color = self.color.unwrap_or(theme::GREEN);
                 shape::ToifImage::new(self.title.area().left_center(), icon.toif)

core/embed/rust/src/ui/layout_delizia/ui_firmware.rs

@@ -410,12 +410,13 @@ impl FirmwareUI for UIDelizia {
 
     fn confirm_properties(
         title: TString<'static>,
+        subtitle: Option<TString<'static>>,
         items: Obj,
         hold: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {
         let paragraphs = PropsList::new(
             items,
-            &theme::TEXT_NORMAL,
+            &theme::TEXT_SUB_GREY_LIGHT,
             &theme::TEXT_MONO,
             &theme::TEXT_MONO,
         )?;
@@ -423,7 +424,7 @@ impl FirmwareUI for UIDelizia {
         let flow = flow::new_confirm_action_simple(
             paragraphs.into_paragraphs(),
             ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-            ConfirmActionStrings::new(title, None, None, hold.then_some(title)),
+            ConfirmActionStrings::new(title, subtitle, None, hold.then_some(title)),
             hold,
             None,
             0,

core/embed/rust/src/ui/shape/progressive_render.rs

@@ -140,4 +140,10 @@ where
             unwrap!(self.shapes.push(holder), "Shape list full");
         }
     }
+
+    fn raise_overflow_exception(&mut self) {}
+
+    fn should_raise_overflow_exception(&self) -> bool {
+        false
+    }
 }

core/embed/rust/src/ui/shape/render.rs

@@ -58,6 +58,10 @@ pub trait Renderer<'a> {
         inner(self);
         self.set_viewport(original);
     }
+
+    fn raise_overflow_exception(&mut self);
+
+    fn should_raise_overflow_exception(&self) -> bool;
 }
 
 // ==========================================================================
@@ -73,6 +77,8 @@ where
     canvas: &'a mut C,
     /// Drawing cache (decompression context, scratch-pad memory)
     cache: &'a DrawingCache<'alloc>,
+
+    overflow: bool,
 }
 
 impl<'a, 'alloc, C> DirectRenderer<'a, 'alloc, C>
@@ -92,7 +98,11 @@ where
         // TODO: consider storing original canvas.viewport
         //       and restoring it by drop() function
 
-        Self { canvas, cache }
+        Self {
+            canvas,
+            cache,
+            overflow: false,
+        }
     }
 }
 
@@ -117,6 +127,14 @@ where
             shape.cleanup(self.cache);
         }
     }
+
+    fn raise_overflow_exception(&mut self) {
+        self.overflow = true;
+    }
+
+    fn should_raise_overflow_exception(&self) -> bool {
+        self.overflow
+    }
 }
 
 pub struct ScopedRenderer<'alloc, 'env, T>
@@ -127,6 +145,7 @@ where
     pub renderer: T,
     _env: core::marker::PhantomData<&'env mut &'env ()>,
     _alloc: core::marker::PhantomData<&'alloc ()>,
+    overflow: bool,
 }
 
 impl<'alloc, T> ScopedRenderer<'alloc, '_, T>
@@ -138,6 +157,7 @@ where
             renderer,
             _env: core::marker::PhantomData,
             _alloc: core::marker::PhantomData,
+            overflow: false,
         }
     }
 
@@ -164,4 +184,12 @@ where
     {
         self.renderer.render_shape(shape);
     }
+
+    fn raise_overflow_exception(&mut self) {
+        self.overflow = true;
+    }
+
+    fn should_raise_overflow_exception(&self) -> bool {
+        self.overflow
+    }
 }

core/embed/rust/src/ui/ui_firmware.rs

@@ -120,6 +120,7 @@ pub trait FirmwareUI {
 
     fn confirm_properties(
         title: TString<'static>,
+        subtitle: Option<TString<'static>>,
         items: Obj, // TODO: replace Obj`
         hold: bool,
     ) -> Result<impl LayoutMaybeTrace, Error>;

core/mocks/generated/trezorui_api.pyi

@@ -256,6 +256,7 @@ def confirm_properties(
     *,
     title: str,
     items: list[tuple[str | None, str | bytes | None, bool]],
+    subtitle: str | None = None,
     hold: bool = False,
 ) -> LayoutObj[UiResult]:
     """Confirm list of key-value pairs. The third component in the tuple should be True if

core/src/apps/solana/layout.py

@@ -92,13 +92,14 @@ async def confirm_instruction(
 
             await confirm_properties(
                 "confirm_instruction",
-                f"{instruction_index}/{instructions_count}: {instruction.ui_name}",
+                f"{instruction_index}/{instructions_count}",
                 (
                     (
                         ui_property.display_name,
                         property_template.format(instruction, value),
                     ),
                 ),
+                instruction.ui_name,
             )
         elif ui_property.account is not None:
             account_template = instruction.get_account_template(ui_property.account)
@@ -134,8 +135,9 @@ async def confirm_instruction(
 
             await confirm_properties(
                 "confirm_instruction",
-                f"{instruction_index}/{instructions_count}: {instruction.ui_name}",
+                f"{instruction_index}/{instructions_count}",
                 account_data,
+                instruction.ui_name,
             )
         else:
             raise ValueError  # Invalid ui property
@@ -158,8 +160,9 @@ async def confirm_instruction(
 
         await confirm_properties(
             "confirm_instruction",
-            f"{instruction_index}/{instructions_count}: {instruction.ui_name}",
+            f"{instruction_index}/{instructions_count}",
             signers,
+            instruction.ui_name,
         )
 
 

core/src/apps/stellar/operations/layout.py

@@ -190,7 +190,7 @@ async def confirm_path_payment_strict_receive_op(
     await confirm_output(
         op.destination_account,
         format_amount(op.destination_amount, op.destination_asset),
-        title=TR.stellar__path_pay,
+        TR.stellar__path_pay,
     )
     await confirm_asset_issuer(op.destination_asset)
     # confirm what the sender is using to pay
@@ -209,7 +209,7 @@ async def confirm_path_payment_strict_send_op(
     await confirm_output(
         op.destination_account,
         format_amount(op.destination_min, op.destination_asset),
-        title=TR.stellar__path_pay_at_least,
+        TR.stellar__path_pay_at_least,
     )
     await confirm_asset_issuer(op.destination_asset)
     # confirm what the sender is using to pay

core/src/trezor/ui/layouts/bolt/__init__.py

@@ -736,12 +736,16 @@ def confirm_properties(
     br_name: str,
     title: str,
     props: Iterable[PropertyType],
+    subtitle: str | None = None,
     hold: bool = False,
     br_code: ButtonRequestType = ButtonRequestType.ConfirmOutput,
 ) -> Awaitable[None]:
     # Monospace flag for values that are bytes.
     items = [(prop[0], prop[1], isinstance(prop[1], bytes)) for prop in props]
 
+    if subtitle:
+        title += ": " + subtitle
+
     return raise_if_not_confirmed(
         trezorui_api.confirm_properties(
             title=title,

core/src/trezor/ui/layouts/caesar/__init__.py

@@ -725,6 +725,7 @@ def confirm_properties(
     br_name: str,
     title: str,
     props: Iterable[PropertyType],
+    subtitle: str | None = None,
     hold: bool = False,
     br_code: ButtonRequestType = ButtonRequestType.ConfirmOutput,
 ) -> Awaitable[None]:
@@ -740,10 +741,13 @@ def confirm_properties(
             is_data = value and " " not in value
             return (key, value, bool(is_data))
 
+    if subtitle:
+        title += ": " + subtitle
+
     return raise_if_not_confirmed(
         trezorui_api.confirm_properties(
             title=title,
-            items=map(handle_bytes, props),  # type: ignore [cannot be assigned to parameter "items"]
+            items=map(handle_bytes, props),
             hold=hold,
         ),
         br_name,

core/src/trezor/ui/layouts/delizia/__init__.py

@@ -654,6 +654,7 @@ def confirm_properties(
     br_name: str,
     title: str,
     props: Iterable[PropertyType],
+    subtitle: str | None = None,
     hold: bool = False,
     br_code: ButtonRequestType = ButtonRequestType.ConfirmOutput,
 ) -> Awaitable[None]:
@@ -663,6 +664,7 @@ def confirm_properties(
     return raise_if_not_confirmed(
         trezorui_api.confirm_properties(
             title=title,
+            subtitle=subtitle,
             items=items,
             hold=hold,
         ),