From f29ccf6009f8763bb5012bff34326c5912b0b018 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Mon, 13 Dec 2021 12:33:05 +0100
Subject: [PATCH] fix(core/rust): UI tweaks

[no changelog]
---
 .../rust/src/ui/component/text/layout.rs      |  6 ++++
 core/embed/rust/src/ui/geometry.rs            | 35 +++++++++++++------
 .../rust/src/ui/model_t1/component/page.rs    |  1 +
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/core/embed/rust/src/ui/component/text/layout.rs b/core/embed/rust/src/ui/component/text/layout.rs
index f4637c8c1..438e5985a 100644
--- a/core/embed/rust/src/ui/component/text/layout.rs
+++ b/core/embed/rust/src/ui/component/text/layout.rs
@@ -149,6 +149,12 @@ impl TextLayout {
         let init_cursor: Point = *cursor;
         let mut remaining_text = text;
 
+        // Check if bounding box is high enough for at least one line.
+        if cursor.y > self.bounds.y1 {
+            sink.out_of_bounds();
+            return LayoutFit::OutOfBounds { processed_chars: 0 };
+        }
+
         while !remaining_text.is_empty() {
             let span = Span::fit_horizontally(
                 remaining_text,
diff --git a/core/embed/rust/src/ui/geometry.rs b/core/embed/rust/src/ui/geometry.rs
index 4546fc174..5837248a0 100644
--- a/core/embed/rust/src/ui/geometry.rs
+++ b/core/embed/rust/src/ui/geometry.rs
@@ -141,6 +141,10 @@ impl Rect {
         self.y1 - self.y0
     }
 
+    pub fn size(&self) -> Offset {
+        Offset::new(self.width(), self.height())
+    }
+
     pub fn top_left(&self) -> Point {
         Point::new(self.x0, self.y0)
     }
@@ -193,10 +197,10 @@ impl Rect {
     }
 
     pub fn hsplit(self, height: i32) -> (Self, Self) {
-        let height = if height.is_positive() {
-            height
-        } else {
+        let height = if height.is_negative() {
             self.height() + height
+        } else {
+            height
         };
 
         let top = Self {
@@ -208,7 +212,7 @@ impl Rect {
 
         let bottom = Self {
             x0: self.x0,
-            y0: top.y0 + height,
+            y0: self.y0 + height,
             x1: self.x1,
             y1: self.y1,
         };
@@ -217,10 +221,10 @@ impl Rect {
     }
 
     pub fn vsplit(self, width: i32) -> (Self, Self) {
-        let width = if width.is_positive() {
-            width
-        } else {
+        let width = if width.is_negative() {
             self.width() + width
+        } else {
+            width
         };
 
         let left = Self {
@@ -231,7 +235,7 @@ impl Rect {
         };
 
         let right = Self {
-            x0: left.x0 + width,
+            x0: self.x0 + width,
             y0: self.y0,
             x1: self.x1,
             y1: self.y1,
@@ -366,12 +370,21 @@ impl LinearLayout {
             .sum();
         let spacing_count = items.len().saturating_sub(1);
         let spacing_sum = spacing_count as i32 * self.spacing;
-        let total_size = item_sum + spacing_sum;
-
+        let naive_size = item_sum + spacing_sum;
         let available_space = match self.axis {
             Axis::Horizontal => area.width(),
             Axis::Vertical => area.height(),
         };
+
+        // scale down spacing to fit everything into area
+        let (total_size, spacing) = if naive_size > available_space {
+            let scaled_space = (available_space - item_sum) / spacing_count as i32;
+            // forbid negative spacing
+            (available_space, scaled_space.max(0))
+        } else {
+            (naive_size, self.spacing)
+        };
+
         let mut cursor = match self.align {
             Alignment::Start => 0,
             Alignment::Center => available_space / 2 - total_size / 2,
@@ -383,7 +396,7 @@ impl LinearLayout {
             let size = item.get_size();
             item.set_area(Rect::from_top_left_and_size(top_left, size));
             cursor += self.axis.main(size.x, size.y);
-            cursor += self.spacing;
+            cursor += spacing;
         }
     }
 }
diff --git a/core/embed/rust/src/ui/model_t1/component/page.rs b/core/embed/rust/src/ui/model_t1/component/page.rs
index 9757b3a47..bd8446123 100644
--- a/core/embed/rust/src/ui/model_t1/component/page.rs
+++ b/core/embed/rust/src/ui/model_t1/component/page.rs
@@ -23,6 +23,7 @@ impl<T> ButtonPage<T> {
         let button_height = theme::FONT_BOLD.line_height() + 2;
         let (content_area, button_area) = area.hsplit(-button_height);
         let (content_area, scrollbar_area) = content_area.vsplit(-ScrollBar::WIDTH);
+        let (content_area, _) = content_area.hsplit(-1);
         (content_area, scrollbar_area, button_area)
     }
 }