tksheet 6.3.4__tar.gz → 6.3.5__tar.gz

{tksheet-6.3.4 → tksheet-6.3.5}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 6.3.4
+Version: 6.3.5
 Summary: Tkinter table / sheet widget
 Home-page: https://github.com/ragardner/tksheet
 Author: ragardner
 Author-email: github@ragardner.simplelogin.com
 License: MIT
-Download-URL: https://github.com/ragardner/tksheet/archive/6.3.4.tar.gz
+Download-URL: https://github.com/ragardner/tksheet/archive/6.3.5.tar.gz
 Description: # **tksheet** [![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.7+-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt) [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
         
         ## **Python tkinter table widget**

{tksheet-6.3.4 → tksheet-6.3.5}/setup.py

@@ -8,7 +8,7 @@ with open(path.join(this_directory, 'README.md'), encoding = 'utf-8') as f:
 setup(
   name = 'tksheet',
   packages = ['tksheet'],
-  version = '6.3.4',
+  version = '6.3.5',
   python_requires = '>=3.7',
   license = 'MIT',
   description = 'Tkinter table / sheet widget',
@@ -17,7 +17,7 @@ setup(
   author = 'ragardner',
   author_email = 'github@ragardner.simplelogin.com',
   url = 'https://github.com/ragardner/tksheet',
-  download_url = 'https://github.com/ragardner/tksheet/archive/6.3.4.tar.gz',
+  download_url = 'https://github.com/ragardner/tksheet/archive/6.3.5.tar.gz',
   keywords = ['tkinter', 'table', 'widget', 'sheet', 'grid', 'tk'],
   install_requires = [],
   classifiers = [

{tksheet-6.3.4 → tksheet-6.3.5}/tksheet/_tksheet.py

@@ -1699,12 +1699,7 @@ class Sheet(tk.Frame):
         return self.MT.currently_selected()
 
     def set_currently_selected(self, row, column, type_="cell", selection_binding=True):
-        self.MT.set_currently_selected(
-            r=row,
-            c=column,
-            type_=type_,
-            inside=True if self.MT.cell_selected(row, column) else False,
-        )
+        self.MT.set_currently_selected(r=row, c=column, type_=type_)
         if selection_binding and self.MT.selection_binding_func is not None:
             self.MT.selection_binding_func(SelectCellEvent("select_cell", row, column))
 

{tksheet-6.3.4 → tksheet-6.3.5}/tksheet/_tksheet_column_headers.py

@@ -209,11 +209,6 @@ class ColumnHeaders(tk.Canvas):
         if binding == "hide_columns":
             self.hide_columns_enabled = False
 
-    def check_mouse_position_width_resizers(self, x, y):
-        for c, (x1, y1, x2, y2) in self.visible_col_dividers.items():
-            if x >= x1 and y >= y1 and x <= x2 and y <= y2:
-                return c
-
     def rc(self, event):
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
         self.focus_set()
@@ -375,6 +370,12 @@ class ColumnHeaders(tk.Canvas):
             if sh:
                 self.itemconfig(t, state="hidden")
                 self.hidd_resize_lines[t] = False
+                
+    def check_mouse_position_width_resizers(self, x, y):
+        for c, (x1, y1, x2, y2) in self.visible_col_dividers.items():
+            if x >= x1 and y >= y1 and x <= x2 and y <= y2:
+                return c
+        return None
 
     def mouse_motion(self, event):
         if not self.currently_resizing_height and not self.currently_resizing_width:
@@ -386,7 +387,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
-                    self.config(cursor="sb_h_double_arrow")
+                    if self.MT.current_cursor != "sb_h_double_arrow":
+                        self.config(cursor="sb_h_double_arrow")
+                        self.MT.current_cursor = "sb_h_double_arrow"
                 else:
                     self.rsz_w = None
             if self.height_resizing_enabled and not mouse_over_resize:
@@ -398,17 +401,20 @@ class ColumnHeaders(tk.Canvas):
                         self.col_height_resize_bbox[3],
                     )
                     if x >= x1 and y >= y1 and x <= x2 and y <= y2:
-                        self.config(cursor="sb_v_double_arrow")
-                        self.rsz_h = True
-                        mouse_over_resize = True
+                        self.rsz_h, mouse_over_resize = True, True
+                        if self.MT.current_cursor != "sb_v_double_arrow":
+                            self.config(cursor="sb_v_double_arrow")
+                            self.MT.current_cursor = "sb_v_double_arrow"
                     else:
                         self.rsz_h = None
                 except Exception:
                     self.rsz_h = None
             if not mouse_over_resize:
                 if self.MT.col_selected(self.MT.identify_col(event, allow_end=False)):
-                    self.config(cursor="hand2")
                     mouse_over_selected = True
+                    if self.MT.current_cursor != "hand2":
+                        self.config(cursor="hand2")
+                        self.MT.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
                 self.MT.reset_mouse_motion_creations()
         if self.extra_motion_func is not None:
@@ -1257,24 +1263,9 @@ class ColumnHeaders(tk.Canvas):
             t, sh = self.hidd_grid.popitem()
             self.coords(t, points)
             if sh:
-                self.itemconfig(
-                    t,
-                    fill=fill,
-                    width=width,
-                    tag=tag,
-                    capstyle=tk.BUTT,
-                    joinstyle=tk.ROUND,
-                )
+                self.itemconfig(t, fill=fill, width=width, tag=tag)
             else:
-                self.itemconfig(
-                    t,
-                    fill=fill,
-                    width=width,
-                    tag=tag,
-                    capstyle=tk.BUTT,
-                    joinstyle=tk.ROUND,
-                    state="normal",
-                )
+                self.itemconfig(t, fill=fill, width=width, tag=tag, state="normal")
             self.disp_grid[t] = True
         else:
             self.disp_grid[self.create_line(points, fill=fill, width=width, tag=tag)] = True

{tksheet-6.3.4 → tksheet-6.3.5}/tksheet/_tksheet_main_table.py

@@ -59,6 +59,7 @@ class MainTable(tk.Canvas):
         self.parentframe = kwargs["parentframe"]
         self.parentframe_width = 0
         self.parentframe_height = 0
+        self.current_cursor = ""
         self.b1_pressed_loc = None
         self.existing_dropdown_canvas_id = None
         self.existing_dropdown_window = None
@@ -211,8 +212,7 @@ class MainTable(tk.Canvas):
         self.show_selected_cells_border = kwargs["show_selected_cells_border"]
         self.new_row_width = 0
         self.new_header_height = 0
-        self.row_width_resize_bbox = tuple()
-        self.header_height_resize_bbox = tuple()
+
         self.CH = kwargs["column_headers_canvas"]
         self.CH.MT = self
         self.CH.RI = kwargs["row_index_canvas"]
@@ -2655,7 +2655,7 @@ class MainTable(tk.Canvas):
         elif binding == "column_height_resize":
             self.CH.enable_bindings("column_height_resize")
             self.TL.rh_state()
-        elif binding == "column_drag_and_drop":
+        elif binding in ("column_drag_and_drop", "move_columns"):
             self.CH.enable_bindings("drag_and_drop")
         elif binding == "double_click_column_resize":
             self.CH.enable_bindings("double_click_column_resize")
@@ -2668,7 +2668,7 @@ class MainTable(tk.Canvas):
             self.TL.rw_state()
         elif binding == "row_select":
             self.RI.enable_bindings("row_select")
-        elif binding == "row_drag_and_drop":
+        elif binding in ("row_drag_and_drop", "move_rows"):
             self.RI.enable_bindings("drag_and_drop")
         elif binding == "arrowkeys":
             self.bind_arrowkeys(self.arrowkey_binding_functions)
@@ -2759,7 +2759,7 @@ class MainTable(tk.Canvas):
         elif binding == "column_height_resize":
             self.CH.disable_bindings("column_height_resize")
             self.TL.rh_state("hidden")
-        elif binding == "column_drag_and_drop":
+        elif binding in ("column_drag_and_drop", "move_columns"):
             self.CH.disable_bindings("drag_and_drop")
         elif binding == "double_click_column_resize":
             self.CH.disable_bindings("double_click_column_resize")
@@ -2772,7 +2772,7 @@ class MainTable(tk.Canvas):
             self.TL.rw_state("hidden")
         elif binding == "row_select":
             self.RI.disable_bindings("row_select")
-        elif binding == "row_drag_and_drop":
+        elif binding in ("row_drag_and_drop", "move_rows"):
             self.RI.disable_bindings("drag_and_drop")
         elif binding == "arrowkeys":
             self.unbind_arrowkeys(self.arrowkey_binding_functions)
@@ -2813,56 +2813,18 @@ class MainTable(tk.Canvas):
         self.create_rc_menus()
 
     def reset_mouse_motion_creations(self, event=None):
-        self.config(cursor="")
-        self.RI.config(cursor="")
-        self.CH.config(cursor="")
+        if self.current_cursor != "":
+            self.config(cursor="")
+            self.RI.config(cursor="")
+            self.CH.config(cursor="")
+            self.current_cursor = ""
         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):
-        if (
-            not self.RI.currently_resizing_height
-            and not self.RI.currently_resizing_width
-            and not self.CH.currently_resizing_height
-            and not self.CH.currently_resizing_width
-        ):
-            mouse_over_resize = False
-            x = self.canvasx(event.x)
-            y = self.canvasy(event.y)
-            if self.RI.width_resizing_enabled and self.show_index and not mouse_over_resize:
-                try:
-                    x1, y1, x2, y2 = (
-                        self.row_width_resize_bbox[0],
-                        self.row_width_resize_bbox[1],
-                        self.row_width_resize_bbox[2],
-                        self.row_width_resize_bbox[3],
-                    )
-                    if x >= x1 and y >= y1 and x <= x2 and y <= y2:
-                        self.config(cursor="sb_h_double_arrow")
-                        self.RI.config(cursor="sb_h_double_arrow")
-                        self.RI.rsz_w = True
-                        mouse_over_resize = True
-                except Exception:
-                    pass
-            if self.CH.height_resizing_enabled and self.show_header and not mouse_over_resize:
-                try:
-                    x1, y1, x2, y2 = (
-                        self.header_height_resize_bbox[0],
-                        self.header_height_resize_bbox[1],
-                        self.header_height_resize_bbox[2],
-                        self.header_height_resize_bbox[3],
-                    )
-                    if x >= x1 and y >= y1 and x <= x2 and y <= y2:
-                        self.config(cursor="sb_v_double_arrow")
-                        self.CH.config(cursor="sb_v_double_arrow")
-                        self.CH.rsz_h = True
-                        mouse_over_resize = True
-                except Exception:
-                    pass
-            if not mouse_over_resize:
-                self.reset_mouse_motion_creations()
+        self.reset_mouse_motion_creations()
         if self.extra_motion_func is not None:
             self.extra_motion_func(event)
 
@@ -2942,16 +2904,6 @@ class MainTable(tk.Canvas):
             c = self.identify_col(x=event.x)
             if r < len(self.row_positions) - 1 and c < len(self.col_positions) - 1:
                 self.toggle_select_cell(r, c, redraw=True)
-        elif self.RI.width_resizing_enabled and self.show_index and self.RI.rsz_h is None and self.RI.rsz_w:
-            self.RI.currently_resizing_width = True
-            self.new_row_width = self.RI.current_width + event.x
-            x = self.canvasx(event.x)
-            self.create_resize_line(x, y1, x, y2, width=1, fill=self.RI.resizing_line_fg, tag="rwl")
-        elif self.CH.height_resizing_enabled and self.show_header and self.CH.rsz_w is None and self.CH.rsz_h:
-            self.CH.currently_resizing_height = True
-            self.new_header_height = self.CH.current_height + event.y
-            y = self.canvasy(event.y)
-            self.create_resize_line(x1, y, x2, y, width=1, fill=self.RI.resizing_line_fg, tag="rhl")
         self.b1_pressed_loc = (r, c)
         if self.extra_b1_press_func is not None:
             self.extra_b1_press_func(event)
@@ -3082,7 +3034,6 @@ class MainTable(tk.Canvas):
         return None
 
     def b1_motion(self, event):
-        x1, y1, x2, y2 = self.get_canvas_visible_area()
         if self.drag_selection_enabled and all(
             v is None for v in (self.RI.rsz_h, self.RI.rsz_w, self.CH.rsz_h, self.CH.rsz_w)
         ):
@@ -3111,37 +3062,10 @@ class MainTable(tk.Canvas):
                 need_redraw = True
             if need_redraw:
                 self.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True, redraw_table=True)
-        elif self.RI.width_resizing_enabled and self.RI.rsz_w is not None and self.RI.currently_resizing_width:
-            self.RI.delete_resize_lines()
-            self.delete_resize_lines()
-            if event.x >= 0:
-                x = self.canvasx(event.x)
-                self.new_row_width = self.RI.current_width + event.x
-                self.create_resize_line(x, y1, x, y2, width=1, fill=self.RI.resizing_line_fg, tag="rwl")
-            else:
-                x = self.RI.current_width + event.x
-                if x < self.min_column_width:
-                    x = int(self.min_column_width)
-                self.new_row_width = x
-                self.RI.create_resize_line(x, y1, x, y2, width=1, fill=self.RI.resizing_line_fg, tag="rwl")
-        elif self.CH.height_resizing_enabled and self.CH.rsz_h is not None and self.CH.currently_resizing_height:
-            self.CH.delete_resize_lines()
-            self.delete_resize_lines()
-            if event.y >= 0:
-                y = self.canvasy(event.y)
-                self.new_header_height = self.CH.current_height + event.y
-                self.create_resize_line(x1, y, x2, y, width=1, fill=self.RI.resizing_line_fg, tag="rhl")
-            else:
-                y = self.CH.current_height + event.y
-                if y < self.min_header_height:
-                    y = int(self.min_header_height)
-                self.new_header_height = y
-                self.CH.create_resize_line(x1, y, x2, y, width=1, fill=self.RI.resizing_line_fg, tag="rhl")
         if self.extra_b1_motion_func is not None:
             self.extra_b1_motion_func(event)
 
     def ctrl_b1_motion(self, event):
-        x1, y1, x2, y2 = self.get_canvas_visible_area()
         if (
             self.ctrl_select_enabled
             and self.drag_selection_enabled
@@ -3234,7 +3158,6 @@ class MainTable(tk.Canvas):
     def double_b1(self, event=None):
         self.mouseclick_outside_editor_or_dropdown_all_canvases()
         self.focus_set()
-        x1, y1, x2, y2 = self.get_canvas_visible_area()
         if (
             self.identify_col(x=event.x, allow_end=False) is None
             or self.identify_row(y=event.y, allow_end=False) is None
@@ -5035,18 +4958,6 @@ class MainTable(tk.Canvas):
         start_row = bisect.bisect_left(self.row_positions, scrollpos_top)
         start_col = bisect.bisect_left(self.col_positions, scrollpos_left)
         end_col = bisect.bisect_right(self.col_positions, scrollpos_right)
-        self.row_width_resize_bbox = (
-            scrollpos_left,
-            scrollpos_top,
-            scrollpos_left + 2,
-            scrollpos_bot,
-        )
-        self.header_height_resize_bbox = (
-            scrollpos_left + 6,
-            scrollpos_top,
-            scrollpos_right,
-            scrollpos_top + 2,
-        )
         self.hidd_text.update(self.disp_text)
         self.disp_text = {}
         self.hidd_high.update(self.disp_high)

{tksheet-6.3.4 → tksheet-6.3.5}/tksheet/_tksheet_row_index.py

@@ -177,11 +177,6 @@ class RowIndex(tk.Canvas):
         elif binding == "drag_and_drop":
             self.drag_and_drop_enabled = False
 
-    def check_mouse_position_height_resizers(self, x, y):
-        for r, (x1, y1, x2, y2) in self.visible_row_dividers.items():
-            if x >= x1 and y >= y1 and x <= x2 and y <= y2:
-                return r
-
     def rc(self, event):
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
         self.focus_set()
@@ -319,6 +314,12 @@ class RowIndex(tk.Canvas):
             if sh:
                 self.itemconfig(t, state="hidden")
                 self.hidd_resize_lines[t] = False
+                
+    def check_mouse_position_height_resizers(self, x, y):
+        for r, (x1, y1, x2, y2) in self.visible_row_dividers.items():
+            if x >= x1 and y >= y1 and x <= x2 and y <= y2:
+                return r
+        return None
 
     def mouse_motion(self, event):
         if not self.currently_resizing_height and not self.currently_resizing_width:
@@ -329,9 +330,10 @@ class RowIndex(tk.Canvas):
             if self.height_resizing_enabled and not mouse_over_resize:
                 r = self.check_mouse_position_height_resizers(x, y)
                 if r is not None:
-                    self.config(cursor="sb_v_double_arrow")
-                    self.rsz_h = r
-                    mouse_over_resize = True
+                    self.rsz_h, mouse_over_resize = r, True
+                    if self.MT.current_cursor != "sb_v_double_arrow":
+                        self.config(cursor="sb_v_double_arrow")
+                        self.MT.current_cursor = "sb_v_double_arrow"
                 else:
                     self.rsz_h = None
             if self.width_resizing_enabled and not mouse_over_resize:
@@ -343,17 +345,20 @@ class RowIndex(tk.Canvas):
                         self.row_width_resize_bbox[3],
                     )
                     if x >= x1 and y >= y1 and x <= x2 and y <= y2:
-                        self.config(cursor="sb_h_double_arrow")
-                        self.rsz_w = True
-                        mouse_over_resize = True
+                        self.rsz_w, mouse_over_resize = True, True
+                        if self.MT.current_cursor != "sb_h_double_arrow":
+                            self.config(cursor="sb_h_double_arrow")
+                            self.MT.current_cursor = "sb_h_double_arrow"
                     else:
                         self.rsz_w = None
                 except Exception:
                     self.rsz_w = None
             if not mouse_over_resize:
                 if self.MT.row_selected(self.MT.identify_row(event, allow_end=False)):
-                    self.config(cursor="hand2")
                     mouse_over_selected = True
+                    if self.MT.current_cursor != "hand2":
+                        self.config(cursor="hand2")
+                        self.MT.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
                 self.MT.reset_mouse_motion_creations()
         if self.extra_motion_func is not None:

{tksheet-6.3.4 → tksheet-6.3.5}/tksheet.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 6.3.4
+Version: 6.3.5
 Summary: Tkinter table / sheet widget
 Home-page: https://github.com/ragardner/tksheet
 Author: ragardner
 Author-email: github@ragardner.simplelogin.com
 License: MIT
-Download-URL: https://github.com/ragardner/tksheet/archive/6.3.4.tar.gz
+Download-URL: https://github.com/ragardner/tksheet/archive/6.3.5.tar.gz
 Description: # **tksheet** [![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.7+-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt) [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
         
         ## **Python tkinter table widget**