tksheet 6.1.8__tar.gz → 6.1.9__tar.gz

{tksheet-6.1.8/tksheet.egg-info → tksheet-6.1.9}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 6.1.8
+Version: 6.1.9
 Summary: Tkinter table / sheet widget
 Home-page: https://github.com/ragardner/tksheet
-Download-URL: https://github.com/ragardner/tksheet/archive/6.1.8.tar.gz
+Download-URL: https://github.com/ragardner/tksheet/archive/6.1.9.tar.gz
 Author: ragardner
 Author-email: github@ragardner.simplelogin.com
 License: MIT

{tksheet-6.1.8 → tksheet-6.1.9}/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.1.8',
+  version = '6.1.9',
   python_requires = '>=3.6',
   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.1.8.tar.gz',
+  download_url = 'https://github.com/ragardner/tksheet/archive/6.1.9.tar.gz',
   keywords = ['tkinter', 'table', 'widget', 'sheet', 'grid', 'tk'],
   install_requires = [],
   classifiers = [

{tksheet-6.1.8 → tksheet-6.1.9}/tksheet/_tksheet_main_table.py

@@ -1814,7 +1814,7 @@ class MainTable(tk.Canvas):
                 self.delete_current()
             deselected = ("deselect_all_cols", deleted_boxes)
         elif r is not None and c is None and cell is None:
-            current = self.find_withtag("currently")
+            current = self.find_withtag("selected")
             current_tags = self.gettags(current[0]) if current else tuple()
             if current:
                 curr_r1, curr_c1, curr_r2, curr_c2 = tuple(int(e) for e in current_tags[1].split("_") if e)
@@ -1836,7 +1836,7 @@ class MainTable(tk.Canvas):
                 self.set_current_to_last()
             deselected = ("deselect_row", deleted_boxes)
         elif c is not None and r is None and cell is None:
-            current = self.find_withtag("currently")
+            current = self.find_withtag("selected")
             current_tags = self.gettags(current[0]) if current else tuple()
             if current:
                 curr_r1, curr_c1, curr_r2, curr_c2 = tuple(int(e) for e in current_tags[1].split("_") if e)
@@ -1865,7 +1865,7 @@ class MainTable(tk.Canvas):
                 self.find_withtag("cells"),
                 self.find_withtag("rows"),
                 self.find_withtag("columns"),
-                self.find_withtag("currently"),
+                self.find_withtag("selected"),
             ):
                 alltags = self.gettags(item)
                 if alltags:
@@ -3054,7 +3054,7 @@ class MainTable(tk.Canvas):
                 else:
                     self.select_cell(rowsel, colsel, redraw=False)
                     last_selected = tuple(
-                        int(e) for e in self.gettags(self.find_withtag("currently"))[1].split("_") if e
+                        int(e) for e in self.gettags(self.find_withtag("selected"))[1].split("_") if e
                     )
                 self.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True, redraw_table=True)
                 if self.shift_selection_binding_func is not None:
@@ -3628,6 +3628,8 @@ class MainTable(tk.Canvas):
                 self.RI.row_height_resize_func(ResizeEvent("row_height_resize", r, old_height, new_height))
         if cell_needs_resize_w or cell_needs_resize_h:
             self.recreate_all_selection_boxes()
+            self.allow_auto_resize_columns = not cell_needs_resize_w
+            self.allow_auto_resize_rows = not cell_needs_resize_h
             if redraw:
                 self.refresh()
                 return True
@@ -5346,7 +5348,7 @@ class MainTable(tk.Canvas):
                     self.hidd_checkbox[t] = False
             if self.show_selected_cells_border:
                 self.tag_raise("cellsbd")
-                self.tag_raise("currently")
+                self.tag_raise("selected")
                 self.tag_raise("rowsbd")
                 self.tag_raise("columnsbd")
         if redraw_header and self.show_header:
@@ -5377,7 +5379,7 @@ class MainTable(tk.Canvas):
             self.find_withtag("cells")
             + self.find_withtag("rows")
             + self.find_withtag("columns")
-            + self.find_withtag("currently")
+            + self.find_withtag("selected")
         )
 
     def get_boxes(self, include_current=True):
@@ -5390,7 +5392,7 @@ class MainTable(tk.Canvas):
                 boxes[tuple(int(e) for e in alltags[1].split("_") if e)] = "rows"
             elif alltags[0] == "columns":
                 boxes[tuple(int(e) for e in alltags[1].split("_") if e)] = "columns"
-            elif include_current and alltags[0] == "currently":
+            elif include_current and alltags[0] == "selected":
                 boxes[tuple(int(e) for e in alltags[1].split("_") if e)] = f"{alltags[2]}"
         return boxes
 
@@ -5467,13 +5469,13 @@ class MainTable(tk.Canvas):
             self.RI.delete("columns", "columnsbd")
             self.CH.delete("columns", "columnsbd")
         if delete_current:
-            self.delete("currently")
-            self.RI.delete("currently")
-            self.CH.delete("currently")
+            self.delete("selected")
+            self.RI.delete("selected")
+            self.CH.delete("selected")
         return deleted_boxes
 
     def currently_selected(self):
-        items = self.find_withtag("currently")
+        items = self.find_withtag("selected")
         if not items:
             return tuple()
         alltags = self.gettags(items[0])
@@ -5481,7 +5483,7 @@ class MainTable(tk.Canvas):
         return CurrentlySelectedClass(box[0], box[1], alltags[2])
 
     def get_tags_of_current(self):
-        items = self.find_withtag("currently")
+        items = self.find_withtag("selected")
         if items:
             return self.gettags(items[0])
         else:
@@ -5489,17 +5491,17 @@ class MainTable(tk.Canvas):
 
     def set_currently_selected(self, r, c, type_="cell"):  # cell, column or row
         r1, c1, r2, c2 = r, c, r + 1, c + 1
-        self.delete("currently")
-        self.RI.delete("currently")
-        self.CH.delete("currently")
+        self.delete("selected")
+        self.RI.delete("selected")
+        self.CH.delete("selected")
         if self.col_positions == [0]:
             c1 = 0
             c2 = 0
         if self.row_positions == [0]:
             r1 = 0
             r2 = 0
-        tagr = ("currently", f"{r1}_{c1}_{r2}_{c2}", type_)
-        tag_index_header = ("cells", f"{r1}_{c1}_{r2}_{c2}")
+        tagr = ("selected", f"{r1}_{c1}_{r2}_{c2}", type_)
+        tag_index_header = ("cells", f"{r1}_{c1}_{r2}_{c2}", "selected")
         if type_ == "cell":
             outline = self.table_selected_cells_border_fg
         elif type_ == "row":
@@ -5566,9 +5568,9 @@ class MainTable(tk.Canvas):
         return tuple()
 
     def delete_current(self):
-        self.delete("currently")
-        self.RI.delete("currently")
-        self.CH.delete("currently")
+        self.delete("selected")
+        self.RI.delete("selected")
+        self.CH.delete("selected")
 
     def create_selected(
         self,
@@ -5581,21 +5583,22 @@ class MainTable(tk.Canvas):
         state="normal",
     ):
         self.itemconfig("cells", state="normal")
+        coords = f"{r1}_{c1}_{r2}_{c2}"
         if type_ == "cells":
-            tagr = ("cells", f"{r1}_{c1}_{r2}_{c2}")
-            tagb = ("cellsbd", f"{r1}_{c1}_{r2}_{c2}")
+            tagr = ("cells", coords)
+            tagb = ("cellsbd", coords)
             mt_bg = self.table_selected_cells_bg
             mt_border_col = self.table_selected_cells_border_fg
         elif type_ == "rows":
-            tagr = ("rows", f"{r1}_{c1}_{r2}_{c2}")
-            tagb = ("rowsbd", f"{r1}_{c1}_{r2}_{c2}")
-            tag_index_header = ("cells", f"{r1}_{c1}_{r2}_{c2}")
+            tagr = ("rows", coords)
+            tagb = ("rowsbd", coords)
+            tag_index_header = ("cells", coords)
             mt_bg = self.table_selected_rows_bg
             mt_border_col = self.table_selected_rows_border_fg
         elif type_ == "columns":
-            tagr = ("columns", f"{r1}_{c1}_{r2}_{c2}")
-            tagb = ("columnsbd", f"{r1}_{c1}_{r2}_{c2}")
-            tag_index_header = ("cells", f"{r1}_{c1}_{r2}_{c2}")
+            tagr = ("columns", coords)
+            tagb = ("columnsbd", coords)
+            tag_index_header = ("cells", coords)
             mt_bg = self.table_selected_columns_bg
             mt_border_col = self.table_selected_columns_border_fg
         self.last_selected = (r1, c1, r2, c2, type_)
@@ -5655,15 +5658,16 @@ class MainTable(tk.Canvas):
         return r, b
 
     def recreate_all_selection_boxes(self):
+        curr = self.currently_selected()
         for item in chain(
             self.find_withtag("cells"),
             self.find_withtag("rows"),
             self.find_withtag("columns"),
-            self.find_withtag("currently"),
         ):
             tags = self.gettags(item)
             if tags:
                 r1, c1, r2, c2 = tuple(int(e) for e in tags[1].split("_") if e)
+                state = self.itemcget(item, "state")
                 self.delete(f"{r1}_{c1}_{r2}_{c2}")
                 self.RI.delete(f"{r1}_{c1}_{r2}_{c2}")
                 self.CH.delete(f"{r1}_{c1}_{r2}_{c2}")
@@ -5673,10 +5677,9 @@ class MainTable(tk.Canvas):
                     r2 = len(self.row_positions) - 1
                 if c2 > len(self.col_positions) - 1:
                     c2 = len(self.col_positions) - 1
-                if tags[0] == "currently":
-                    self.set_currently_selected(r1, c1, tags[2])
-                else:
-                    self.create_selected(r1, c1, r2, c2, tags[0])
+                self.create_selected(r1, c1, r2, c2, tags[0], state=state)
+        if curr:
+            self.set_currently_selected(curr.row, curr.column, curr.type_)
         self.tag_lower("rows")
         self.RI.tag_lower("rows")
         self.tag_lower("columns")
@@ -5685,7 +5688,7 @@ class MainTable(tk.Canvas):
         self.RI.tag_lower("cells")
         self.CH.tag_lower("cells")
         if not self.show_selected_cells_border:
-            self.tag_lower("currently")
+            self.tag_lower("selected")
 
     def get_redraw_selections(self, startr, endr, startc, endc):
         d = defaultdict(list)
@@ -5720,7 +5723,7 @@ class MainTable(tk.Canvas):
             self.find_withtag("cells"),
             self.find_withtag("rows"),
             self.find_withtag("columns"),
-            self.find_withtag("currently"),
+            self.find_withtag("selected"),
         ):
             r1, c1, r2, c2 = tuple(int(e) for e in self.gettags(item)[1].split("_") if e)
             if r1 < min_y:
@@ -5963,7 +5966,7 @@ class MainTable(tk.Canvas):
                 return True
         return False
 
-    # don't have to use "currently" because you can't have a current without a selection box
+    # don't have to use "selected" because you can't have a current without a selection box
     def cell_selected(self, r, c, inc_cols=False, inc_rows=False):
         if not isinstance(r, int) or not isinstance(c, int):
             return False
@@ -6024,11 +6027,11 @@ class MainTable(tk.Canvas):
         return tuple()
 
     def hide_current(self):
-        for item in self.find_withtag("currently"):
+        for item in self.find_withtag("selected"):
             self.itemconfig(item, state="hidden")
 
     def show_current(self):
-        for item in self.find_withtag("currently"):
+        for item in self.find_withtag("selected"):
             self.itemconfig(item, state="normal")
 
     def open_cell(self, event=None, ignore_existing_editor=False):

{tksheet-6.1.8 → tksheet-6.1.9/tksheet.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 6.1.8
+Version: 6.1.9
 Summary: Tkinter table / sheet widget
 Home-page: https://github.com/ragardner/tksheet
-Download-URL: https://github.com/ragardner/tksheet/archive/6.1.8.tar.gz
+Download-URL: https://github.com/ragardner/tksheet/archive/6.1.9.tar.gz
 Author: ragardner
 Author-email: github@ragardner.simplelogin.com
 License: MIT