tksheet 7.4.12__tar.gz → 7.4.13__tar.gz

{tksheet-7.4.12/tksheet.egg-info → tksheet-7.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.12
+Version: 7.4.13
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -63,23 +63,23 @@ License-File: LICENSE.txt
   <tbody>
     <tr>
       <td style="color: LightCoral">Versions 6.x.x &#8594;</td>
-      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-6">Documentation</a></td>
+      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-6" target="_blank">Documentation</a></td>
     </tr>
     <tr>
       <td style="color: lightgreen">Versions 7.x.x &#8594;</td>
-      <td><a href="https://ragardner.github.io/tksheet/DOCUMENTATION.html">Documentation</a></td>
+      <td><a href="https://ragardner.github.io/tksheet/DOCUMENTATION.html" target="_blank">Documentation</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md">Changelog</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md" target="_blank">Changelog</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions">Questions</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions" target="_blank">Questions</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues">Issues</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues" target="_blank">Issues</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions and Contributors</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions" target="_blank">Suggestions and Contributors</a></td>
     </tr>
   </tbody>
 </table>

{tksheet-7.4.12 → tksheet-7.4.13}/README.md

@@ -18,23 +18,23 @@
   <tbody>
     <tr>
       <td style="color: LightCoral">Versions 6.x.x &#8594;</td>
-      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-6">Documentation</a></td>
+      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-6" target="_blank">Documentation</a></td>
     </tr>
     <tr>
       <td style="color: lightgreen">Versions 7.x.x &#8594;</td>
-      <td><a href="https://ragardner.github.io/tksheet/DOCUMENTATION.html">Documentation</a></td>
+      <td><a href="https://ragardner.github.io/tksheet/DOCUMENTATION.html" target="_blank">Documentation</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md">Changelog</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md" target="_blank">Changelog</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions">Questions</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions" target="_blank">Questions</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues">Issues</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues" target="_blank">Issues</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions and Contributors</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions" target="_blank">Suggestions and Contributors</a></td>
     </tr>
   </tbody>
 </table>

{tksheet-7.4.12 → tksheet-7.4.13}/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.12"
+version = "7.4.13"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.4.12 → tksheet-7.4.13}/tksheet/__init__.py

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

{tksheet-7.4.12 → tksheet-7.4.13}/tksheet/column_headers.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 from collections.abc import Callable, Hashable, Iterator, Sequence
 from functools import partial
 from itertools import cycle, islice, repeat
-from math import ceil, floor
+from math import ceil
 from operator import itemgetter
 from typing import Any, Literal
 
@@ -741,7 +741,7 @@ class ColumnHeaders(tk.Canvas):
         if size < self.ops.min_column_width:
             new_col_pos = ceil(self.MT.col_positions[self.rsz_w - 1] + self.ops.min_column_width)
         elif size > self.ops.max_column_width:
-            new_col_pos = floor(self.MT.col_positions[self.rsz_w - 1] + self.ops.max_column_width)
+            new_col_pos = int(self.MT.col_positions[self.rsz_w - 1] + self.ops.max_column_width)
         increment = new_col_pos - self.MT.col_positions[self.rsz_w]
         self.MT.col_positions[self.rsz_w + 1 :] = [
             e + increment for e in islice(self.MT.col_positions, self.rsz_w + 1, None)
@@ -1373,7 +1373,7 @@ class ColumnHeaders(tk.Canvas):
         if draw_arrow:
             mod = (self.MT.header_txt_height - 1) if self.MT.header_txt_height % 2 else self.MT.header_txt_height
             small_mod = int(mod / 5)
-            mid_y = floor(self.MT.min_header_height / 2)
+            mid_y = int(self.MT.min_header_height / 2)
             if open_:
                 # up arrow
                 points = (
@@ -1552,13 +1552,13 @@ class ColumnHeaders(tk.Canvas):
             else:
                 align = self.align
             if kwargs:
-                max_width = crightgridln - cleftgridln - txt_h - 2
-                if align.endswith("w"):
+                max_width = crightgridln - cleftgridln - txt_h - 5
+                if align[-1] == "w":
                     draw_x = cleftgridln + 2
-                elif align.endswith("e"):
+                elif align[-1] == "e":
                     draw_x = crightgridln - 5 - txt_h
-                elif align.endswith("n"):
-                    draw_x = cleftgridln + ceil((crightgridln - cleftgridln - txt_h) / 2)
+                elif align[-1] == "n":
+                    draw_x = cleftgridln + (crightgridln - cleftgridln - txt_h) / 2
                 self.redraw_dropdown(
                     cleftgridln,
                     0,
@@ -1573,18 +1573,18 @@ class ColumnHeaders(tk.Canvas):
                 )
             else:
                 max_width = crightgridln - cleftgridln - 2
-                if align.endswith("w"):
+                if align[-1] == "w":
                     draw_x = cleftgridln + 2
-                elif align.endswith("e"):
+                elif align[-1] == "e":
                     draw_x = crightgridln - 2
-                elif align.endswith("n"):
-                    draw_x = cleftgridln + floor((crightgridln - cleftgridln) / 2)
+                elif align[-1] == "n":
+                    draw_x = cleftgridln + (crightgridln - cleftgridln) / 2
                 if (kwargs := self.get_cell_kwargs(datacn, key="checkbox")) and max_width > txt_h + 1:
                     box_w = txt_h + 1
-                    if align.endswith("w"):
+                    if align[-1] == "w":
                         draw_x += box_w + 3
-                    elif align.endswith("n"):
-                        draw_x += ceil(box_w / 2) + 1
+                    elif align[-1] == "n":
+                        draw_x += box_w / 2 + 1
                     max_width -= box_w + 4
                     try:
                         draw_check = (
@@ -1606,9 +1606,9 @@ class ColumnHeaders(tk.Canvas):
                     )
             if (
                 max_width < self.MT.header_txt_width
-                or (align.endswith("w") and draw_x > scrollpos_right)
-                or (align.endswith("e") and cleftgridln + 5 > scrollpos_right)
-                or (align.endswith("n") and cleftgridln + 5 > scrollpos_right)
+                or (align[-1] == "w" and draw_x > scrollpos_right)
+                or (align[-1] == "e" and cleftgridln + 5 > scrollpos_right)
+                or (align[-1] == "n" and cleftgridln + 5 > scrollpos_right)
             ):
                 continue
             text = self.cell_str(datacn, fix=False)

{tksheet-7.4.12 → tksheet-7.4.13}/tksheet/functions.py

@@ -793,6 +793,11 @@ def move_elements_by_mapping_gen(
     return (seq[old_idxs[i]] if i in old_idxs else next(remaining_values) for i in range(len(seq)))
 
 
+def move_fast(seq: list[Any], new_idxs: dict[int, int], old_idxs: dict[int, int]) -> list[Any]:
+    remaining_values = (e for i, e in enumerate(seq) if i not in new_idxs)
+    return [seq[old_idxs[i]] if i in old_idxs else next(remaining_values) for i in range(len(seq))]
+
+
 def move_elements_to(
     seq: list[Any],
     move_to: int,
@@ -819,10 +824,17 @@ def get_new_indexes(
     returns {old idx: new idx, ...}
     """
     offset = sum(1 for i in to_move if i < move_to)
-    new_idxs = dict(zip(to_move, range(move_to - offset, move_to - offset + len(to_move))))
-    if get_inverse:
-        return new_idxs, dict(zip(new_idxs.values(), new_idxs))
-    return new_idxs
+    correct_move_to = move_to - offset
+    if not get_inverse:
+        return {elem: correct_move_to + i for i, elem in enumerate(to_move)}
+    else:
+        new_idxs = {}
+        old_idxs = {}
+        for i, elem in enumerate(to_move):
+            value = correct_move_to + i
+            new_idxs[elem] = value
+            old_idxs[value] = elem
+        return new_idxs, old_idxs
 
 
 def insert_items(
@@ -833,7 +845,7 @@ def insert_items(
     """
     seq: list[Any]
     to_insert: keys are ints sorted, representing list indexes to insert items.
-               Values are any, e.g. {1: 200, 0: 200}
+               Values are any, e.g. {0: 200, 1: 200}
     """
     if to_insert:
         if seq_len_func and next(reversed(to_insert)) >= len(seq) + len(to_insert):