Remove TextArea.allow_text_overflow

Author: kdmukai

src/seedsigner/gui/components.py

@@ -387,7 +387,6 @@ class TextArea(BaseComponent):
     is_text_centered: bool = True
     supersampling_factor: int = 2  # 1 = disabled; 2 = default, double sample (4px square rendered for 1px)
     auto_line_break: bool = True
-    allow_text_overflow: bool = False
     is_horizontal_scrolling_enabled: bool = False
     horizontal_scroll_speed: int = 40  # px per sec
     horizontal_scroll_begin_hold_secs: float = 2.0
@@ -399,10 +398,6 @@ def __post_init__(self):
         if self.is_horizontal_scrolling_enabled and self.auto_line_break:
             raise Exception("TextArea: Cannot have auto_line_break and horizontal scrolling enabled at the same time")
 
-        if self.is_horizontal_scrolling_enabled and not self.allow_text_overflow:
-            self.allow_text_overflow = True
-            logger.warning("TextArea: allow_text_overflow gets overridden to True when horizontal scrolling is enabled")
-
         if not self.font_name:
             self.font_name = GUIConstants.get_body_font_name()
         if not self.font_size:
@@ -459,7 +454,6 @@ def __post_init__(self):
                 width=self.width - 2*self.edge_padding,
                 font_name=self.font_name,
                 font_size=self.font_size,
-                allow_text_overflow=self.allow_text_overflow,
             )
 
             # Other components, like IconTextLine will need to know how wide the actual
@@ -486,14 +480,9 @@ def __post_init__(self):
 
         else:
             if total_text_height > self.height:
-                if not self.allow_text_overflow:
-                    # For now, early into the l10n rollout, we can't enforce strict
-                    # conformance here. Too many screens will just break if this is were
-                    # to raise an exception.
-                    logger.warning(f"Text cannot fit in target rect with this font/size\n\ttotal_text_height: {total_text_height} | self.height: {self.height}")
-                else:
-                    # Just let it render past the bottom edge
-                    pass
+                # Let it render past the bottom edge. Will be up to the dev or translator
+                # to review the screenshot and revise the text as needed.
+                logger.warning(f"Text cannot fit in target rect with this font/size\n\ttotal_text_height: {total_text_height} | self.height: {self.height}")
 
             else:
                 # Vertically center the text's starting point
@@ -746,7 +735,6 @@ class ScrollableTextLine(TextArea):
     def __post_init__(self):
         self.auto_line_break = False
         self.is_horizontal_scrolling_enabled = True
-        self.allow_text_overflow = True
         super().__post_init__()
 
 
@@ -808,7 +796,6 @@ class IconTextLine(BaseComponent):
     font_size: int = None
     is_text_centered: bool = False
     auto_line_break: bool = False
-    allow_text_overflow: bool = True
     screen_x: int = 0
     screen_y: int = 0
 
@@ -851,7 +838,6 @@ def __post_init__(self):
                 auto_line_break=False,
                 screen_x=text_screen_x,
                 screen_y=self.screen_y,
-                allow_text_overflow=False,
             )
         else:
             self.label_textarea = None        
@@ -871,7 +857,6 @@ def __post_init__(self):
             edge_padding=0,
             is_text_centered=self.is_text_centered if not self.icon_name else False,
             auto_line_break=self.auto_line_break,
-            allow_text_overflow=self.allow_text_overflow,
             screen_x=text_screen_x,
             screen_y=value_textarea_screen_y,
         )
@@ -1521,7 +1506,6 @@ def __post_init__(self):
             button_kwargs["text"] = self.text
             button_kwargs["font_color"] = self.font_color
             button_kwargs["background_color"] = self.background_color
-            button_kwargs["allow_text_overflow"] = True
             button_kwargs["auto_line_break"] = False
             del button_kwargs["horizontal_scroll_begin_hold_secs"]
             del button_kwargs["horizontal_scroll_end_hold_secs"]
@@ -1826,8 +1810,7 @@ def calc_bezier_curve(p1: Tuple[int,int], p2: Tuple[int,int], p3: Tuple[int,int]
 def reflow_text_for_width(text: str,
                           width: int,
                           font_name=GUIConstants.get_body_font_name(),
-                          font_size=GUIConstants.get_body_font_size(),
-                          allow_text_overflow: bool=False) -> list[dict]:
+                          font_size=GUIConstants.get_body_font_size()) -> list[dict]:
     """
     Reflows text to fit within `width` by breaking long lines up.
 
@@ -1854,9 +1837,6 @@ def reflow_text_for_width(text: str,
         SettingsConstants.LOCALE__JAPANESE,
         SettingsConstants.LOCALE__KOREAN,
     ]
-    if treat_chars_as_words:
-        # Relax UI constraints even if the result isn't optimal
-        allow_text_overflow = True
 
     # Stores each line of text and its rendering starting x-coord
     text_lines = []
@@ -1904,9 +1884,9 @@ def _binary_len_search(min_index, max_index, word_spacer):
                 # Candidate line is possibly shorter than necessary.
                 return _binary_len_search(min_index=index, max_index=max_index, word_spacer=word_spacer)
 
-        if len(text.split()) == 1 and not allow_text_overflow and not treat_chars_as_words:
-            # No whitespace chars to split on!
-            raise TextDoesNotFitException("Text cannot fit in target rect with this font+size")
+        if len(text.split()) == 1 and not treat_chars_as_words:
+            # No whitespace chars to split on! Warn but proceed anyway.
+            logger.warning("Text cannot fit in target rect with this font+size")
 
         # Now we're ready to go line-by-line into our line break binary search!
         for line in text.split("\n"):
@@ -1946,8 +1926,7 @@ def reflow_text_into_pages(text: str,
                            height: int,
                            font_name=GUIConstants.get_body_font_name(),
                            font_size=GUIConstants.get_body_font_size(),
-                           line_spacer: int = GUIConstants.BODY_LINE_SPACING,
-                           allow_text_overflow: bool=False) -> list[str]:
+                           line_spacer: int = GUIConstants.BODY_LINE_SPACING) -> list[str]:
     """
     Invokes `reflow_text_for_width` above to convert long text into width-limited
     individual text lines and then calculates how many lines will fit on a "page" and
@@ -1958,8 +1937,7 @@ def reflow_text_into_pages(text: str,
     reflowed_lines_dicts = reflow_text_for_width(text=text,
                                            width=width,
                                            font_name=font_name,
-                                           font_size=font_size,
-                                           allow_text_overflow=allow_text_overflow)
+                                           font_size=font_size)
 
     lines = []
     for line_dict in reflowed_lines_dicts:

src/seedsigner/gui/screens/psbt_screens.py

@@ -722,7 +722,6 @@ def __post_init__(self):
                 text=self.op_return_data.decode(errors="strict"),  # "strict" is a good enough heuristic to decide if it's human readable
                 font_size=GUIConstants.get_top_nav_title_font_size(),
                 is_text_centered=True,
-                allow_text_overflow=True,
                 screen_y=self.top_nav.height + GUIConstants.COMPONENT_PADDING,
                 height=self.buttons[0].screen_y - self.top_nav.height - 2*GUIConstants.COMPONENT_PADDING,
             ))

src/seedsigner/gui/screens/screen.py

@@ -786,7 +786,6 @@ def render_brightness_tip(self, image: Image.Image) -> None:
                 width=int(rectangle_width/2),
                 screen_x=chevron_up_icon.screen_x + GUIConstants.ICON_INLINE_FONT_SIZE,
                 screen_y=chevron_up_icon.screen_y - 2,  # -2 to account for Icon's positioning
-                allow_text_overflow=False
             ).render()
 
             # TRANSLATOR_NOTE: Decrease QR code screen brightness
@@ -804,7 +803,6 @@ def render_brightness_tip(self, image: Image.Image) -> None:
                 width=int(rectangle_width/2),
                 screen_x=chevron_down_icon.screen_x + GUIConstants.ICON_INLINE_FONT_SIZE,
                 screen_y=chevron_down_icon.screen_y - 2,  # -2 to account for Icon's positioning
-                allow_text_overflow=False
             ).render()
 
             # Write our temp Image onto the main image
@@ -906,7 +904,6 @@ class LargeIconStatusScreen(ButtonListScreen):
     text: str = ""                          # The body text of the screen
     text_edge_padding: int = GUIConstants.EDGE_PADDING
     button_data: list = None
-    allow_text_overflow: bool = False
 
 
     def __post_init__(self):

src/seedsigner/gui/screens/seed_screens.py

@@ -1129,7 +1129,6 @@ def __post_init__(self):
                 font_color="orange",
                 is_text_centered=True,
                 screen_y=screen_y,
-                allow_text_overflow=True
             ))
             screen_y += char_height + 2
 
@@ -1641,7 +1640,6 @@ def __post_init__(self):
                 text=self.sign_message_data["message"],
                 width=renderer.canvas_width - 2*GUIConstants.EDGE_PADDING,
                 height=message_height,
-                allow_text_overflow=True,
             )
             self.sign_message_data["paged_message"] = paged
 
@@ -1660,7 +1658,6 @@ def __post_init__(self):
         message_display = TextArea(
             text=self.sign_message_data["paged_message"][self.page_num],
             is_text_centered=False,
-            allow_text_overflow=True,
             screen_y=start_y,
         )
         self.components.append(message_display)

src/seedsigner/gui/toast.py

@@ -45,7 +45,6 @@ def __post_init__(self):
             auto_line_break=True,
             width=self.canvas_width - icon_delta_x - 2 * GUIConstants.COMPONENT_PADDING - 2 * self.outline_thickness,
             screen_x=icon_delta_x + GUIConstants.COMPONENT_PADDING,
-            allow_text_overflow=False,
             height_ignores_below_baseline=True,
         )
 

src/seedsigner/views/view.py

@@ -357,7 +357,6 @@ def run(self):
             title=_("System Error"),
             status_headline=self.error[0],
             text=self.error[1] + "\n" + self.error[2],
-            allow_text_overflow=True,  # Fit what we can, let the rest go off the edges
         )
 
         return Destination(MainMenuView, clear_history=True)
@@ -389,7 +388,6 @@ def run(self):
             text=self.error_msg,
             button_data=button_data,
             show_back_button=False,
-            allow_text_overflow=True,  # Fit what we can, let the rest go off the edges
         )
 
         if button_data[selected_menu_num] == self.UPDATE_SETTING:

tests/test_flows_seed.py

@@ -519,7 +519,6 @@ def inject_mesage_as_paged_message(self, view: View):
             text=self.controller.sign_message_data["message"],
             width=240 - 2*GUIConstants.EDGE_PADDING,
             height=240 - GUIConstants.TOP_NAV_HEIGHT - 3*GUIConstants.EDGE_PADDING - GUIConstants.BUTTON_HEIGHT,
-            allow_text_overflow=True,
         )
         self.controller.sign_message_data["paged_message"] = paged