Fixed UI bug on window resize

mkcn · Jan 15, 2022 · c6cb27b · c6cb27b
1 parent 152eeeb
commit c6cb27b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/fastHistory/pick/loopSelectTLDR.py b/fastHistory/pick/loopSelectTLDR.py
@@ -141,6 +141,7 @@ def run_loop_tldr(self, cached_in_memory_pages):
                 self.move_left()
             # this occurs when the console size changes
             elif c == Keys.KEY_RESIZE:
+                self.drawer.reset()
                 self.search_field.set_max_x(self.drawer.get_max_x(), with_margin_x=True)
                 self.update_tldr_options_to_draw()
             # move cursor to the beginning

diff --git a/fastHistory/pick/pageSelectTLDR.py b/fastHistory/pick/pageSelectTLDR.py
@@ -211,31 +211,33 @@ def _draw_example_column(self, tldr_examples_draw, words_to_mark, example_draw_i
             self.drawer.set_x(self.TLDR_PAGES_COLUMN_SIZE)
 
             for i in range(len(tldr_examples_draw)):
-                row_type = tldr_examples_draw[i][ParsedTLDRExample.INDEX_EXAMPLE_TYPE]
-                row_value = tldr_examples_draw[i][ParsedTLDRExample.INDEX_EXAMPLE_VALUE]
-                complete_background_row = False
-                if row_type == ParsedTLDRExample.Type.EXAMPLE:
-                    if i == example_draw_index:
-                        if has_focus:
-                            background_color = self.drawer.color_selected_row
-                            complete_background_row = True
+                # this check is needed in case the screen get smaller while the last item is currently selected
+                if self.drawer.get_y() < self.drawer.get_max_y() - 1:
+                    row_type = tldr_examples_draw[i][ParsedTLDRExample.INDEX_EXAMPLE_TYPE]
+                    row_value = tldr_examples_draw[i][ParsedTLDRExample.INDEX_EXAMPLE_VALUE]
+                    complete_background_row = False
+                    if row_type == ParsedTLDRExample.Type.EXAMPLE:
+                        if i == example_draw_index:
+                            if has_focus:
+                                background_color = self.drawer.color_selected_row
+                                complete_background_row = True
+                            else:
+                                background_color = self.drawer.color_cmd_sample
                         else:
                             background_color = self.drawer.color_cmd_sample
                     else:
-                        background_color = self.drawer.color_cmd_sample
-                else:
-                    background_color = self.drawer.NULL_COLOR
-                row_value = example_content_shift.get_text_shifted(row_value, tldr_example_column_size)
-                # set starting point because we are in the second column
-                self.drawer.set_x(self.TLDR_PAGES_COLUMN_SIZE)
-                self.draw_marked_string(row_value,
-                                        words_to_mark,
-                                        recursive=True,
-                                        color_marked=self.drawer.color_search,
-                                        color_default=background_color)
-                if complete_background_row:
-                    self.drawer.fill_row(color=background_color, max_x=self.drawer.get_max_x() - 1)
-                self.drawer.new_line()
+                        background_color = self.drawer.NULL_COLOR
+                    row_value = example_content_shift.get_text_shifted(row_value, tldr_example_column_size)
+                    # set starting point because we are in the second column
+                    self.drawer.set_x(self.TLDR_PAGES_COLUMN_SIZE)
+                    self.draw_marked_string(row_value,
+                                            words_to_mark,
+                                            recursive=True,
+                                            color_marked=self.drawer.color_search,
+                                            color_default=background_color)
+                    if complete_background_row:
+                        self.drawer.fill_row(color=background_color, max_x=self.drawer.get_max_x() - 1)
+                    self.drawer.new_line()
 
     def _draw_just_msg(self, msg: str, x: int = 0):
         shift = 1