tksheet 7.2.0__tar.gz → 7.2.1__tar.gz

{tksheet-7.2.0/tksheet.egg-info → tksheet-7.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.0
+Version: 7.2.1
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

{tksheet-7.2.0 → tksheet-7.2.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.2.0"
+version = "7.2.1"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.2.0 → tksheet-7.2.1}/tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.2.0"
+__version__ = "7.2.1"
 
 from .colors import (
     color_map,

{tksheet-7.2.0 → tksheet-7.2.1}/tksheet/column_headers.py

@@ -903,12 +903,13 @@ class ColumnHeaders(tk.Canvas):
 
     def toggle_select_col(
         self,
-        column,
-        add_selection=True,
-        redraw=True,
-        run_binding_func=True,
-        set_as_current=True,
-    ):
+        column: int,
+        add_selection: bool = True,
+        redraw: bool = True,
+        run_binding_func: bool = True,
+        set_as_current: bool = True,
+        ext: bool = False,
+    ) -> int:
         if add_selection:
             if self.MT.col_selected(column):
                 fill_iid = self.MT.deselect(c=column, redraw=redraw)
@@ -918,26 +919,40 @@ class ColumnHeaders(tk.Canvas):
                     redraw=redraw,
                     run_binding_func=run_binding_func,
                     set_as_current=set_as_current,
+                    ext=ext,
                 )
         else:
             if self.MT.col_selected(column):
                 fill_iid = self.MT.deselect(c=column, redraw=redraw)
             else:
-                fill_iid = self.select_col(column, redraw=redraw)
+                fill_iid = self.select_col(column, redraw=redraw, ext=ext)
         return fill_iid
 
-    def select_col(self, c, redraw=False, run_binding_func=True):
+    def select_col(
+        self,
+        c: int,
+        redraw: bool = False,
+        run_binding_func: bool = True,
+        ext: bool = False,
+    ) -> int:
         self.MT.deselect("all", redraw=False)
-        fill_iid = self.MT.create_selection_box(0, c, len(self.MT.row_positions) - 1, c + 1, "columns")
+        fill_iid = self.MT.create_selection_box(0, c, len(self.MT.row_positions) - 1, c + 1, "columns", ext=ext)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
             self.MT.run_selection_binding("columns")
         return fill_iid
 
-    def add_selection(self, c, redraw=False, run_binding_func=True, set_as_current=True):
+    def add_selection(
+        self,
+        c: int,
+        redraw: bool = False,
+        run_binding_func: bool = True,
+        set_as_current: bool = True,
+        ext: bool = False,
+    ) -> int:
         box = (0, c, len(self.MT.row_positions) - 1, c + 1, "columns")
-        fill_iid = self.MT.create_selection_box(*box, set_current=set_as_current)
+        fill_iid = self.MT.create_selection_box(*box, set_current=set_as_current, ext=ext)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:

{tksheet-7.2.0 → tksheet-7.2.1}/tksheet/main_table.py

@@ -1851,9 +1851,10 @@ class MainTable(tk.Canvas):
         c: int,
         redraw: bool = False,
         run_binding_func: bool = True,
+        ext: bool = False,
     ) -> int:
         self.deselect("all", redraw=False)
-        fill_iid = self.create_selection_box(r, c, r + 1, c + 1, state="hidden")
+        fill_iid = self.create_selection_box(r, c, r + 1, c + 1, state="hidden", ext=ext)
         if redraw:
             self.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
@@ -1867,8 +1868,9 @@ class MainTable(tk.Canvas):
         redraw: bool = False,
         run_binding_func: bool = True,
         set_as_current: bool = False,
+        ext: bool = False,
     ) -> int:
-        fill_iid = self.create_selection_box(r, c, r + 1, c + 1, state="hidden", set_current=set_as_current)
+        fill_iid = self.create_selection_box(r, c, r + 1, c + 1, state="hidden", set_current=set_as_current, ext=ext)
         if redraw:
             self.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
@@ -1883,6 +1885,7 @@ class MainTable(tk.Canvas):
         redraw: bool = True,
         run_binding_func: bool = True,
         set_as_current: bool = True,
+        ext: bool = False,
     ) -> int | None:
         if add_selection:
             if self.cell_selected(row, column, inc_rows=True, inc_cols=True):
@@ -1894,12 +1897,13 @@ class MainTable(tk.Canvas):
                     redraw=redraw,
                     run_binding_func=run_binding_func,
                     set_as_current=set_as_current,
+                    ext=ext,
                 )
         else:
             if self.cell_selected(row, column, inc_rows=True, inc_cols=True):
                 fill_iid = self.deselect(r=row, c=column, redraw=redraw)
             else:
-                fill_iid = self.select_cell(row, column, redraw=redraw)
+                fill_iid = self.select_cell(row, column, redraw=redraw, ext=ext)
         return fill_iid
 
     def get_select_event(self, being_drawn_item: None | int = None) -> EventDataDict:
@@ -3527,7 +3531,7 @@ class MainTable(tk.Canvas):
             self.table_first_ln_ins = self.table_half_txt_height + 2
         else:
             self.table_first_ln_ins = self.table_half_txt_height + 3
-        self.min_row_height = int(self.table_first_ln_ins * 2.25)
+        self.min_row_height = int(self.table_first_ln_ins * 2.22)
         self.table_xtra_lines_increment = int(self.table_txt_height)
         if self.min_row_height < 12:
             self.min_row_height = 12
@@ -3556,7 +3560,7 @@ class MainTable(tk.Canvas):
         else:
             self.header_first_ln_ins = self.header_half_txt_height + 3
         self.header_xtra_lines_increment = self.header_txt_height
-        self.min_header_height = int(self.header_first_ln_ins * 2.25)
+        self.min_header_height = int(self.header_first_ln_ins * 2.22)
         if (
             isinstance(self.PAR.ops.default_header_height, int)
             and self.PAR.ops.default_header_height < self.min_header_height
@@ -5935,7 +5939,7 @@ class MainTable(tk.Canvas):
             self.hidd_boxes.add(item)
             self.itemconfig(item, state="hidden")
 
-    def hide_selection_box(self, item: int | None, set_current: bool = True) -> bool:
+    def hide_selection_box(self, item: int | None) -> bool:
         if item is None or item is True:
             return
         box = self.selection_boxes.pop(item)
@@ -5948,6 +5952,10 @@ class MainTable(tk.Canvas):
             self.set_current_to_last()
         if item == self.being_drawn_item:
             self.being_drawn_item = None
+        elif item == self.RI.being_drawn_item:
+            self.RI.being_drawn_item = None
+        elif item == self.CH.being_drawn_item:
+            self.CH.being_drawn_item = None
         return True
 
     def hide_selected(self) -> None:
@@ -5965,6 +5973,7 @@ class MainTable(tk.Canvas):
         state: str = "normal",
         set_current: bool | tuple[int, int] = True,
         run_binding: bool = False,
+        ext: bool = False,
     ) -> int:
         if self.col_positions == [0]:
             c1 = 0
@@ -6019,7 +6028,8 @@ class MainTable(tk.Canvas):
         )
         bd_iid = None
         if self.PAR.ops.show_selected_cells_border and (
-            (self.being_drawn_item is None and self.RI.being_drawn_item is None and self.CH.being_drawn_item is None)
+            ext
+            or (self.being_drawn_item is None and self.RI.being_drawn_item is None and self.CH.being_drawn_item is None)
             or self.selection_boxes
         ):
             bd_iid = self.display_box(

{tksheet-7.2.0 → tksheet-7.2.1}/tksheet/row_index.py

@@ -921,6 +921,7 @@ class RowIndex(tk.Canvas):
         redraw: bool = True,
         run_binding_func: bool = True,
         set_as_current: bool = True,
+        ext: bool = False,
     ) -> int | None:
         if add_selection:
             if self.MT.row_selected(row):
@@ -931,18 +932,25 @@ class RowIndex(tk.Canvas):
                     redraw=redraw,
                     run_binding_func=run_binding_func,
                     set_as_current=set_as_current,
+                    ext=ext,
                 )
         else:
             if self.MT.row_selected(row):
                 fill_iid = self.MT.deselect(r=row, redraw=redraw)
             else:
-                fill_iid = self.select_row(row, redraw=redraw)
+                fill_iid = self.select_row(row, redraw=redraw, ext=ext)
         return fill_iid
 
-    def select_row(self, r: int, redraw: bool = False, run_binding_func: bool = True) -> int:
+    def select_row(
+        self,
+        r: int,
+        redraw: bool = False,
+        run_binding_func: bool = True,
+        ext: bool = False,
+    ) -> int:
         self.MT.deselect("all", redraw=False)
         box = (r, 0, r + 1, len(self.MT.col_positions) - 1, "rows")
-        fill_iid = self.MT.create_selection_box(*box)
+        fill_iid = self.MT.create_selection_box(*box, ext=ext)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
@@ -955,9 +963,10 @@ class RowIndex(tk.Canvas):
         redraw: bool = False,
         run_binding_func: bool = True,
         set_as_current: bool = True,
+        ext: bool = False,
     ) -> int:
         box = (r, 0, r + 1, len(self.MT.col_positions) - 1, "rows")
-        fill_iid = self.MT.create_selection_box(*box, set_current=set_as_current)
+        fill_iid = self.MT.create_selection_box(*box, set_current=set_as_current, ext=ext)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=False, redraw_row_index=True)
         if run_binding_func:

{tksheet-7.2.0 → tksheet-7.2.1}/tksheet/sheet.py

@@ -21,7 +21,6 @@ from .functions import (
     dropdown_search_function,
     event_dict,
     fix_format_kwargs,
-    new_tk_event,
     force_bool,
     get_checkbox_dict,
     get_checkbox_kwargs,
@@ -30,6 +29,7 @@ from .functions import (
     idx_param_to_int,
     is_iterable,
     key_to_span,
+    new_tk_event,
     num2alpha,
     pickled_event_dict,
     pop_positions,
@@ -3137,6 +3137,7 @@ class Sheet(tk.Frame):
             row if isinstance(row, int) else int(row),
             redraw=False,
             run_binding_func=run_binding_func,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3145,6 +3146,7 @@ class Sheet(tk.Frame):
             column if isinstance(column, int) else int(column),
             redraw=False,
             run_binding_func=run_binding_func,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3154,6 +3156,7 @@ class Sheet(tk.Frame):
             column if isinstance(column, int) else int(column),
             redraw=False,
             run_binding_func=run_binding_func,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3175,6 +3178,7 @@ class Sheet(tk.Frame):
             redraw=False,
             run_binding_func=run_binding_func,
             set_as_current=set_as_current,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3190,6 +3194,7 @@ class Sheet(tk.Frame):
             redraw=False,
             run_binding_func=run_binding_func,
             set_as_current=set_as_current,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3205,6 +3210,7 @@ class Sheet(tk.Frame):
             redraw=False,
             run_binding_func=run_binding_func,
             set_as_current=set_as_current,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3224,6 +3230,7 @@ class Sheet(tk.Frame):
             redraw=False,
             run_binding_func=run_binding_func,
             set_as_current=set_as_current,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3241,6 +3248,7 @@ class Sheet(tk.Frame):
             redraw=False,
             run_binding_func=run_binding_func,
             set_as_current=set_as_current,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3258,6 +3266,7 @@ class Sheet(tk.Frame):
             redraw=False,
             run_binding_func=run_binding_func,
             set_as_current=set_as_current,
+            ext=True,
         )
         return self.set_refresh_timer(redraw)
 
@@ -3269,7 +3278,14 @@ class Sheet(tk.Frame):
         c2: int,
         type_: Literal["cells", "rows", "columns", "cols"] = "cells",
     ) -> int:
-        return self.MT.create_selection_box(r1=r1, c1=c1, r2=r2, c2=c2, type_="columns" if type_ == "cols" else type_)
+        return self.MT.create_selection_box(
+            r1=r1,
+            c1=c1,
+            r2=r2,
+            c2=c2,
+            type_="columns" if type_ == "cols" else type_,
+            ext=True,
+        )
 
     def recreate_all_selection_boxes(self) -> Sheet:
         self.MT.recreate_all_selection_boxes()

{tksheet-7.2.0 → tksheet-7.2.1/tksheet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.0
+Version: 7.2.1
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors