tksheet 7.4.19__tar.gz → 7.4.20__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tksheet
-Version: 7.4.19
+Version: 7.4.20
 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.19 → tksheet-7.4.20}/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.19"
+version = "7.4.20"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

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

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

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

@@ -326,7 +326,6 @@ class ColumnHeaders(tk.Canvas):
             x = self.canvasx(event.x)
             y = self.canvasy(event.y)
             mouse_over_resize = False
-            mouse_over_selected = False
             if self.width_resizing_enabled:
                 c = self.check_mouse_position_width_resizers(x, y)
                 if c is not None:
@@ -353,16 +352,16 @@ class ColumnHeaders(tk.Canvas):
                         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.current_cursor != "hand2":
-                    self.config(cursor="hand2")
-                    self.current_cursor = "hand2"
-            if not mouse_over_resize and not mouse_over_selected:
-                if self.current_cursor != "":
-                    self.config(cursor="")
-                    self.current_cursor = ""
-                self.MT.reset_resize_vars()
+            if not mouse_over_resize:
+                if self.MT.col_selected(self.MT.identify_col(event, allow_end=False)):
+                    if self.current_cursor != "hand2":
+                        self.config(cursor="hand2")
+                        self.current_cursor = "hand2"
+                else:
+                    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.19 → tksheet-7.4.20}/tksheet/main_table.py

@@ -385,8 +385,8 @@ class MainTable(tk.Canvas):
 
     def basic_bindings(self, enable: bool = True) -> None:
         bindings = (
+            ("<Enter>", self, self.mouse_motion),
             ("<Configure>", self, self.window_configured),
-            ("<Motion>", self, self.mouse_motion),
             ("<ButtonPress-1>", self, self.b1_press),
             ("<B1-Motion>", self, self.b1_motion),
             ("<ButtonRelease-1>", self, self.b1_release),
@@ -3559,9 +3559,8 @@ class MainTable(tk.Canvas):
         self.CH.rsz_h = None
 
     def mouse_motion(self, event: Any) -> None:
-        if self.current_cursor != "":
-            self.config(cursor="")
-            self.current_cursor = ""
+        self.config(cursor="")
+        self.current_cursor = ""
         self.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
@@ -6183,7 +6182,7 @@ class MainTable(tk.Canvas):
             and can_width >= self.col_positions[-1] + self.PAR.ops.empty_horizontal
             and self.PAR.xscroll_showing
         ):
-            self.PAR.xscroll.grid_forget()
+            self.PAR.xscroll.grid_remove()
             self.PAR.xscroll_showing = False
         elif (
             can_width < self.col_positions[-1] + self.PAR.ops.empty_horizontal
@@ -6191,10 +6190,10 @@ class MainTable(tk.Canvas):
             and not self.PAR.xscroll_disabled
             and can_height > 40
         ):
-            self.PAR.xscroll.grid(row=2, column=0, columnspan=2, sticky="nswe")
+            self.PAR.xscroll.grid()
             self.PAR.xscroll_showing = True
         if can_height >= self.row_positions[-1] + self.PAR.ops.empty_vertical and self.PAR.yscroll_showing:
-            self.PAR.yscroll.grid_forget()
+            self.PAR.yscroll.grid_remove()
             self.PAR.yscroll_showing = False
         elif (
             can_height < self.row_positions[-1] + self.PAR.ops.empty_vertical
@@ -6202,7 +6201,7 @@ class MainTable(tk.Canvas):
             and not self.PAR.yscroll_disabled
             and can_width > 40
         ):
-            self.PAR.yscroll.grid(row=0, column=2, rowspan=3, sticky="nswe")
+            self.PAR.yscroll.grid()
             self.PAR.yscroll_showing = True
 
     def _overflow(

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

@@ -322,8 +322,7 @@ class RowIndex(tk.Canvas):
             x = self.canvasx(event.x)
             y = self.canvasy(event.y)
             mouse_over_resize = False
-            mouse_over_selected = False
-            if self.height_resizing_enabled and not mouse_over_resize:
+            if self.height_resizing_enabled:
                 r = self.check_mouse_position_height_resizers(x, y)
                 if r is not None:
                     self.rsz_h, mouse_over_resize = r, True
@@ -358,19 +357,19 @@ class RowIndex(tk.Canvas):
                         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.current_cursor != "hand2":
-                    self.config(cursor="hand2")
-                    self.current_cursor = "hand2"
-            if not mouse_over_resize and not mouse_over_selected:
-                if self.current_cursor != "":
-                    self.config(cursor="")
-                    self.current_cursor = ""
-                self.MT.reset_resize_vars()
+            if not mouse_over_resize:
+                if self.MT.row_selected(self.MT.identify_row(event, allow_end=False)):
+                    if self.current_cursor != "hand2":
+                        self.config(cursor="hand2")
+                        self.current_cursor = "hand2"
+                else:
+                    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):
+    def double_b1(self, event: Any) -> None:
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
         self.focus_set()
         if (
@@ -416,7 +415,7 @@ class RowIndex(tk.Canvas):
         self.mouse_motion(event)
         try_binding(self.extra_double_b1_func, event)
 
-    def b1_press(self, event: Any):
+    def b1_press(self, event: Any) -> None:
         self.MT.unbind("<MouseWheel>")
         self.focus_set()
         self.closed_dropdown = self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -485,7 +484,7 @@ class RowIndex(tk.Canvas):
                         self.toggle_select_row(r, redraw=True)
         try_binding(self.extra_b1_press_func, event)
 
-    def b1_motion(self, event: Any):
+    def b1_motion(self, event: Any) -> None:
         x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
         if self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
             y = self.canvasy(event.y)

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

@@ -446,7 +446,6 @@ class Sheet(tk.Frame):
             style=f"Sheet{self.unique_id}.Vertical.TScrollbar",
         )
         self.MT["yscrollcommand"] = self.yscroll.set
-        self.RI["yscrollcommand"] = self.yscroll.set
         self.xscroll = ttk.Scrollbar(
             self,
             command=self.MT._xscrollbar,
@@ -454,7 +453,6 @@ class Sheet(tk.Frame):
             style=f"Sheet{self.unique_id}.Horizontal.TScrollbar",
         )
         self.MT["xscrollcommand"] = self.xscroll.set
-        self.CH["xscrollcommand"] = self.xscroll.set
         self.show()
         if show_top_left is False or (show_top_left is None and (not show_row_index or not show_header)):
             self.hide("top_left")

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

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