listpick 0.1.16.9__py3-none-any.whl → 0.1.16.10__py3-none-any.whl

listpick/listpick_app.py

@@ -96,6 +96,7 @@ class Picker:
         options_list: list[str] = [],
         user_settings : str = "",
         separator : str = "    ",
+        header_separator : str = "   │",
         search_query : str = "",
         search_count : int = 0,
         search_index : int = 0,
@@ -243,6 +244,7 @@ class Picker:
         self.options_list = options_list
         self.user_settings = user_settings
         self.separator = separator
+        self.header_separator = header_separator
         self.search_query = search_query
         self.search_count = search_count
         self.search_index = search_index
@@ -946,7 +948,7 @@ class Picker:
 
 
                 header_str += f"{col_str:^{self.column_widths[i]-len(number)}}"
-                header_str += self.separator
+                header_str += self.header_separator
                 header_str_w = min(self.rows_w-self.left_gutter_width, visible_columns_total_width+1, self.term_w-self.startx)
 
             header_str = header_str[self.leftmost_char:]
@@ -2067,6 +2069,7 @@ class Picker:
             if self.indexed_items[new_pos][0] in self.unselectable_indices: new_pos+=1
             else: break
         self.cursor_pos = new_pos
+        self.ensure_no_overscroll()
         return True
 
     def cursor_up(self, count=1) -> bool:
@@ -2080,6 +2083,7 @@ class Picker:
             elif new_pos in self.unselectable_indices: new_pos -= 1
             else: break
         self.cursor_pos = new_pos
+        self.ensure_no_overscroll()
         return True
 
     def remapped_key(self, key: int, val: int, key_remappings: dict) -> bool:
@@ -2505,23 +2509,53 @@ class Picker:
             self.split_right = not self.split_right
             if self.right_panes[self.right_pane_index]["data"] in [[], None, {}]:
                 self.right_panes[self.right_pane_index]["data"] = self.right_panes[self.right_pane_index]["get_data"](self.right_panes[self.right_pane_index]["data"], self.get_function_data())
+        self.ensure_no_overscroll()
 
     def toggle_left_pane(self):
         if len(self.left_panes):
             self.split_left = not self.split_left
             if self.left_panes[self.left_pane_index]["data"] in [[], None, {}]:
                 self.left_panes[self.left_pane_index]["data"] = self.left_panes[self.left_pane_index]["get_data"](self.left_panes[self.left_pane_index]["data"], self.get_function_data())
+        self.ensure_no_overscroll()
 
 
     def cycle_right_pane(self, increment=1):
         if len(self.right_panes) > 1:
             self.right_pane_index = (self.right_pane_index+1)%len(self.right_panes)
             self.initial_right_split_time -= self.right_panes[self.right_pane_index]["refresh_time"]
+        self.ensure_no_overscroll()
 
     def cycle_left_pane(self, increment=1):
         if len(self.left_panes) > 1:
             self.left_pane_index = (self.left_pane_index+1)%len(self.left_panes)
             self.initial_left_split_time -= self.left_panes[self.left_pane_index]["refresh_time"]
+        self.ensure_no_overscroll()
+
+    def ensure_no_overscroll(self):
+        """ 
+        Ensure that we haven't scrolled past the last column.
+
+        This check should be performed after:
+          - Terminal resize event
+          - Scrolling down - i.e., rows with potentially different widths come into view
+        """
+        self.calculate_section_sizes()
+        self.get_visible_rows()
+        self.column_widths = get_column_widths(
+            self.visible_rows,
+            header=self.header,
+            max_column_width=self.max_column_width,
+            number_columns=self.number_columns,
+            max_total_width=self.rows_w,
+            unicode_char_width=self.unicode_char_width
+        )
+
+        row_width = sum(self.column_widths) + len(self.separator)*(len(self.column_widths)-1)
+        if row_width - self.leftmost_char < self.rows_w:
+            if row_width <= self.rows_w - self.left_gutter_width:
+                self.leftmost_char = 0
+            else:
+                self.leftmost_char = row_width - (self.rows_w - self.left_gutter_width) + 5
 
     def run(self) -> Tuple[list[int], str, dict]:
         """ Run the picker. """
@@ -2991,6 +3025,7 @@ class Picker:
                             self.selected_cells_by_row[row] = [col]
 
                 self.cursor_down()
+                self.ensure_no_overscroll()
             elif self.check_key("select_all", key, self.keys_dict):  # Select all (m or ctrl-a)
                 self.select_all()
 
@@ -3005,6 +3040,7 @@ class Picker:
                 if new_pos < len(self.indexed_items):
                     self.cursor_pos = new_pos
 
+                self.ensure_no_overscroll()
                 self.draw_screen()
 
             elif self.check_key("cursor_bottom", key, self.keys_dict):
@@ -3014,6 +3050,7 @@ class Picker:
                     else: break
                 if new_pos < len(self.items) and new_pos >= 0:
                     self.cursor_pos = new_pos
+                self.ensure_no_overscroll()
                 self.draw_screen()
                 # current_row = items_per_page - 1
                 # if current_page + 1 == (len(self.indexed_items) + items_per_page - 1) // items_per_page:
@@ -3138,6 +3175,7 @@ class Picker:
                     self.leftmost_char = end_of_cell - display_width
 
                 self.leftmost_char = max(0, min(column_set_width - display_width + 5, self.leftmost_char))
+                self.ensure_no_overscroll()
 
             elif self.check_key("col_select_prev", key, self.keys_dict):
                 if len(self.items) > 0 and len(self.items[0]) > 0:
@@ -3166,6 +3204,7 @@ class Picker:
                     self.leftmost_char = start_of_cell
 
                 self.leftmost_char = max(0, min(column_set_width - display_width + 5, self.leftmost_char))
+                self.ensure_no_overscroll()
 
             elif self.check_key("scroll_right", key, self.keys_dict):
                 self.logger.info(f"key_function scroll_right")
@@ -3317,14 +3356,8 @@ class Picker:
             elif key == curses.KEY_RESIZE:  # Terminal resize signal
 
                 self.calculate_section_sizes()
-                self.column_widths = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=self.rows_w, unicode_char_width=self.unicode_char_width)
+                self.ensure_no_overscroll()
 
-                row_width = sum(self.column_widths) + len(self.separator)*(len(self.column_widths)-1)
-                if row_width - self.leftmost_char < self.rows_w:
-                    if row_width <= self.rows_w - self.left_gutter_width:
-                        self.leftmost_char = 0
-                    else:
-                        self.leftmost_char = row_width - (self.rows_w - self.left_gutter_width) + 5
                 self.stdscr.clear()
                 self.stdscr.refresh()
                 self.draw_screen()

{listpick-0.1.16.9.dist-info → listpick-0.1.16.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.16.9
+Version: 0.1.16.10
 Summary: Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.
 Home-page: https://github.com/grimandgreedy/listpick
 Author: Grim

{listpick-0.1.16.9.dist-info → listpick-0.1.16.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=t690QmA4_fJ-zi2PhmRrwjMUr2oKOvxEScdDner2mr0,212136
+listpick/listpick_app.py,sha256=X8PYkBDVhP137M9w7IQAMz5A9dowh4p6bpWHRj8SNfM,213114
 listpick/pane/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/pane/get_data.py,sha256=l12mHIb6qoZWIfW5zZZY8K8EqNcyIcRiHgtRaM2CVGs,2735
 listpick/pane/left_pane_functions.py,sha256=SVIW4Ef8uNPBQRk4hL67mEFL3pfgChSFZSMRz06CVzw,5543
@@ -33,9 +33,9 @@ listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,532
 listpick/utils/table_to_list_of_lists.py,sha256=XBj7eGBDF15BRME-swnoXyOfZWxXCxrXp0pzsBfcJ5g,12224
 listpick/utils/user_input.py,sha256=L3ylI7nnuFM_TP1XKwpiKpxUSkNb2W5cr7mJjTmv_6E,4582
 listpick/utils/utils.py,sha256=nsR6orCBQy3rTXrCweq8cV-RzRVU15v3J9NclPeAOJk,13741
-listpick-0.1.16.9.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.16.9.dist-info/METADATA,sha256=S_kppW9DHyjThJf01PtkuKOA2EAQQVh3J31Oe8iE_Hc,8024
-listpick-0.1.16.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.16.9.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.16.9.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.16.9.dist-info/RECORD,,
+listpick-0.1.16.10.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.16.10.dist-info/METADATA,sha256=g830mNna2Vn1PxyeN5DBSgWm8CQP0CPU4le48laOd48,8025
+listpick-0.1.16.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.16.10.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.16.10.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.16.10.dist-info/RECORD,,