tksheet 7.4.18__tar.gz → 7.4.19__tar.gz

{tksheet-7.4.18/tksheet.egg-info → tksheet-7.4.19}/PKG-INFO

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

{tksheet-7.4.18 → tksheet-7.4.19}/pyproject.toml

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

{tksheet-7.4.18 → tksheet-7.4.19}/tksheet/__init__.py

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

{tksheet-7.4.18 → tksheet-7.4.19}/tksheet/column_headers.py

@@ -4,7 +4,7 @@ import tkinter as tk
 from collections import defaultdict
 from collections.abc import Callable, Hashable, Iterator, Sequence
 from functools import partial
-from itertools import cycle, islice, repeat
+from itertools import islice, repeat
 from math import ceil
 from operator import itemgetter
 from typing import Any, Literal
@@ -54,11 +54,10 @@ class ColumnHeaders(tk.Canvas):
         self.MT = None  # is set from within MainTable() __init__
         self.RI: RowIndex | None = None  # is set from within MainTable() __init__
         self.TL = None  # is set from within TopLeftRectangle() __init__
+        self.current_cursor = ""
         self.popup_menu_loc = None
         self.extra_begin_edit_cell_func = None
         self.extra_end_edit_cell_func = None
-        self.centre_alignment_text_mod_indexes = (slice(1, None), slice(None, -1))
-        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
         self.b1_pressed_loc = None
         self.closed_dropdown = None
         self.being_drawn_item = None
@@ -332,9 +331,9 @@ class ColumnHeaders(tk.Canvas):
                 c = self.check_mouse_position_width_resizers(x, y)
                 if c is not None:
                     self.rsz_w, mouse_over_resize = c, True
-                    if self.MT.current_cursor != "sb_h_double_arrow":
+                    if self.current_cursor != "sb_h_double_arrow":
                         self.config(cursor="sb_h_double_arrow")
-                        self.MT.current_cursor = "sb_h_double_arrow"
+                        self.current_cursor = "sb_h_double_arrow"
                 else:
                     self.rsz_w = None
             if self.height_resizing_enabled and not mouse_over_resize:
@@ -347,20 +346,23 @@ class ColumnHeaders(tk.Canvas):
                     )
                     if x >= x1 and y >= y1 and x <= x2 and y <= y2:
                         self.rsz_h, mouse_over_resize = True, True
-                        if self.MT.current_cursor != "sb_v_double_arrow":
+                        if self.current_cursor != "sb_v_double_arrow":
                             self.config(cursor="sb_v_double_arrow")
-                            self.MT.current_cursor = "sb_v_double_arrow"
+                            self.current_cursor = "sb_v_double_arrow"
                     else:
                         self.rsz_h = None
                 except Exception:
                     self.rsz_h = None
             if not mouse_over_resize and self.MT.col_selected(self.MT.identify_col(event, allow_end=False)):
                 mouse_over_selected = True
-                if self.MT.current_cursor != "hand2":
+                if self.current_cursor != "hand2":
                     self.config(cursor="hand2")
-                    self.MT.current_cursor = "hand2"
+                    self.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
-                self.MT.reset_mouse_motion_creations()
+                if self.current_cursor != "":
+                    self.config(cursor="")
+                    self.current_cursor = ""
+                self.MT.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
     def double_b1(self, event: Any) -> None:

{tksheet-7.4.18 → tksheet-7.4.19}/tksheet/main_table.py

@@ -7,7 +7,7 @@ from bisect import bisect_left, bisect_right
 from collections import defaultdict, deque
 from collections.abc import Callable, Generator, Hashable, Iterator, Sequence
 from functools import partial
-from itertools import accumulate, chain, cycle, filterfalse, islice, repeat
+from itertools import accumulate, chain, filterfalse, islice, repeat
 from operator import itemgetter
 from re import IGNORECASE, escape, sub
 from tkinter import TclError
@@ -130,8 +130,6 @@ class MainTable(tk.Canvas):
         self.ctrl_b1_pressed = False
         self.b1_pressed_loc = None
         self.closed_dropdown = None
-        self.centre_alignment_text_mod_indexes = (slice(1, None), slice(None, -1))
-        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
         self.allow_auto_resize_columns = True
         self.allow_auto_resize_rows = True
         self.span = self.PAR.span
@@ -1390,25 +1388,25 @@ class MainTable(tk.Canvas):
                 )
         selboxr = selected_r + new_data_numrows if added_rows else selected_r_adjusted_new_data_numrows
         selboxc = selected_c + new_data_numcols if added_cols else selected_c_adjusted_new_data_numcols
-        self.deselect("all", redraw=False)
-        self.set_currently_selected(
-            *curr_coords,
-            item=self.create_selection_box(
-                selected_r,
-                selected_c,
-                selboxr,
-                selboxc,
-                type_="cells",
-                set_current=False,
-                run_binding=True,
-            ),
-        )
-        event_data["selection_boxes"] = self.get_boxes()
-        event_data["selected"] = self.selected
-        self.see(selected_r, selected_c, redraw=False)
-        self.refresh()
         event_data = self.bulk_edit_validation(event_data)
         if event_data["cells"]["table"] or event_data["added"]["rows"] or event_data["added"]["columns"]:
+            self.deselect("all", redraw=False)
+            self.set_currently_selected(
+                *curr_coords,
+                item=self.create_selection_box(
+                    selected_r,
+                    selected_c,
+                    selboxr,
+                    selboxc,
+                    type_="cells",
+                    set_current=False,
+                    run_binding=True,
+                ),
+            )
+            event_data["selection_boxes"] = self.get_boxes()
+            event_data["selected"] = self.selected
+            self.see(selected_r, selected_c, redraw=False)
+            self.refresh()
             if self.undo_enabled:
                 self.undo_stack.append(stored_event_dict(event_data))
             try_binding(self.extra_end_ctrl_v_func, event_data, "end_ctrl_v")
@@ -3554,19 +3552,17 @@ class MainTable(tk.Canvas):
                 for binding in self.PAR.ops[bindings_key]:
                     widget.unbind(binding)
 
-    def reset_mouse_motion_creations(self) -> None:
-        if self.current_cursor != "":
-            self.config(cursor="")
-            self.RI.config(cursor="")
-            self.CH.config(cursor="")
-            self.current_cursor = ""
+    def reset_resize_vars(self) -> None:
         self.RI.rsz_w = None
         self.RI.rsz_h = None
         self.CH.rsz_w = None
         self.CH.rsz_h = None
 
     def mouse_motion(self, event: Any) -> None:
-        self.reset_mouse_motion_creations()
+        if self.current_cursor != "":
+            self.config(cursor="")
+            self.current_cursor = ""
+        self.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
     def not_currently_resizing(self) -> bool:

{tksheet-7.4.18 → tksheet-7.4.19}/tksheet/row_index.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 from collections.abc import Callable, Generator, Hashable, Iterator, Sequence
 from contextlib import suppress
 from functools import partial
-from itertools import cycle, islice, repeat
+from itertools import islice, repeat
 from math import ceil
 from re import findall
 from typing import Any, Literal
@@ -56,6 +56,7 @@ class RowIndex(tk.Canvas):
         self.MT = None  # is set from within MainTable() __init__
         self.CH = None  # is set from within MainTable() __init__
         self.TL = None  # is set from within TopLeftRectangle() __init__
+        self.current_cursor = ""
         self.new_iid_ctr = -1
         self.current_width = None
         self.popup_menu_loc = None
@@ -63,8 +64,6 @@ class RowIndex(tk.Canvas):
         self.extra_end_edit_cell_func = None
         self.b1_pressed_loc = None
         self.closed_dropdown = None
-        self.centre_alignment_text_mod_indexes = (slice(1, None), slice(None, -1))
-        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
         self.being_drawn_item = None
         self.extra_motion_func = None
         self.extra_b1_press_func = None
@@ -328,9 +327,9 @@ class RowIndex(tk.Canvas):
                 r = self.check_mouse_position_height_resizers(x, y)
                 if r is not None:
                     self.rsz_h, mouse_over_resize = r, True
-                    if self.MT.current_cursor != "sb_v_double_arrow":
+                    if self.current_cursor != "sb_v_double_arrow":
                         self.config(cursor="sb_v_double_arrow")
-                        self.MT.current_cursor = "sb_v_double_arrow"
+                        self.current_cursor = "sb_v_double_arrow"
                 else:
                     self.rsz_h = None
             if (
@@ -352,20 +351,23 @@ class RowIndex(tk.Canvas):
                     )
                     if x >= x1 and y >= y1 and x <= x2 and y <= y2:
                         self.rsz_w, mouse_over_resize = True, True
-                        if self.MT.current_cursor != "sb_h_double_arrow":
+                        if self.current_cursor != "sb_h_double_arrow":
                             self.config(cursor="sb_h_double_arrow")
-                            self.MT.current_cursor = "sb_h_double_arrow"
+                            self.current_cursor = "sb_h_double_arrow"
                     else:
                         self.rsz_w = None
                 except Exception:
                     self.rsz_w = None
             if not mouse_over_resize and self.MT.row_selected(self.MT.identify_row(event, allow_end=False)):
                 mouse_over_selected = True
-                if self.MT.current_cursor != "hand2":
+                if self.current_cursor != "hand2":
                     self.config(cursor="hand2")
-                    self.MT.current_cursor = "hand2"
+                    self.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
-                self.MT.reset_mouse_motion_creations()
+                if self.current_cursor != "":
+                    self.config(cursor="")
+                    self.current_cursor = ""
+                self.MT.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
     def double_b1(self, event: Any):

{tksheet-7.4.18 → tksheet-7.4.19}/tksheet/sheet.py

@@ -328,6 +328,7 @@ class Sheet(tk.Frame):
         if treeview:
             index_align = "w"
             auto_resize_row_index = True
+            paste_can_expand_y = False
         for k, v in locals().items():
             if (xk := backwards_compatibility_keys.get(k, k)) in self.ops and v != self.ops[xk]:
                 self.ops[xk] = v
@@ -4182,6 +4183,7 @@ class Sheet(tk.Frame):
         self.MT.create_rc_menus()
         if "treeview" in kwargs:
             self.index_align("nw", redraw=False)
+            self.ops.paste_can_expand_y = False
         return self.set_refresh_timer(redraw)
 
     def set_scrollbar_options(self) -> Sheet:

{tksheet-7.4.18 → tksheet-7.4.19/tksheet.egg-info}/PKG-INFO

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