tksheet 7.4.12__tar.gz → 7.4.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.12
+Version: 7.4.14
 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.14}/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.14}/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.14"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}
@@ -35,3 +35,4 @@ Funding = "https://github.com/ragardner"
 line-length = 120
 extend-select = ["I", "F", "C4", "E", "B", "SIM"]
 fix = true
+ignore = ["SIM401"]

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

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

{tksheet-7.4.12 → tksheet-7.4.14}/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)
@@ -1283,7 +1283,6 @@ class ColumnHeaders(tk.Canvas):
                     self.current_height - 1,
                     fill=fill,
                     outline=self.ops.header_fg if has_dd and self.ops.show_dropdown_borders else "",
-                    tag="hi",
                 )
         elif not kwargs:
             if "columns" in selections and c in selections["columns"]:
@@ -1295,7 +1294,6 @@ class ColumnHeaders(tk.Canvas):
                     self.current_height - 1,
                     fill=self.ops.header_selected_columns_bg,
                     outline=self.ops.header_fg if has_dd and self.ops.show_dropdown_borders else "",
-                    tag="hi",
                 )
             elif "cells" in selections and c in selections["cells"]:
                 txtfg = self.ops.header_selected_cells_fg
@@ -1306,7 +1304,6 @@ class ColumnHeaders(tk.Canvas):
                     self.current_height - 1,
                     fill=self.ops.header_selected_cells_bg,
                     outline=self.ops.header_fg if has_dd and self.ops.show_dropdown_borders else "",
-                    tag="hi",
                 )
             else:
                 txtfg = self.ops.header_fg
@@ -1320,7 +1317,6 @@ class ColumnHeaders(tk.Canvas):
         y2: float,
         fill: str,
         outline: str,
-        tag: str | tuple[str],
     ) -> bool:
         coords = (x1, y1, x2, y2)
         if self.hidd_high:
@@ -1329,10 +1325,9 @@ class ColumnHeaders(tk.Canvas):
             if showing:
                 self.itemconfig(iid, fill=fill, outline=outline)
             else:
-                self.itemconfig(iid, fill=fill, outline=outline, tag=tag, state="normal")
-            self.tag_raise(iid)
+                self.itemconfig(iid, fill=fill, outline=outline, state="normal")
         else:
-            iid = self.create_rectangle(coords, fill=fill, outline=outline, tag=tag)
+            iid = self.create_rectangle(coords, fill=fill, outline=outline)
         self.disp_high[iid] = True
         return True
 
@@ -1341,19 +1336,17 @@ class ColumnHeaders(tk.Canvas):
         points: Sequence[float],
         fill: str,
         width: int,
-        tag: str | tuple[str],
     ) -> None:
         if self.hidd_grid:
             t, sh = self.hidd_grid.popitem()
             self.coords(t, points)
             if sh:
-                self.itemconfig(t, fill=fill, width=width, tag=tag)
+                self.itemconfig(t, fill=fill, width=width)
             else:
-                self.itemconfig(t, fill=fill, width=width, tag=tag, state="normal")
+                self.itemconfig(t, fill=fill, width=width, state="normal")
             self.disp_grid[t] = True
-            self.tag_raise(t)
         else:
-            self.disp_grid[self.create_line(points, fill=fill, width=width, tag=tag)] = True
+            self.disp_grid[self.create_line(points, fill=fill, width=width)] = True
 
     def redraw_dropdown(
         self,
@@ -1363,17 +1356,16 @@ class ColumnHeaders(tk.Canvas):
         y2: float,
         fill: str,
         outline: str,
-        tag: str | tuple[str],
         draw_outline: bool = True,
         draw_arrow: bool = True,
         open_: bool = False,
     ) -> None:
         if draw_outline and self.ops.show_dropdown_borders:
-            self.redraw_highlight(x1 + 1, y1 + 1, x2, y2, fill="", outline=self.ops.header_fg, tag=tag)
+            self.redraw_highlight(x1 + 1, y1 + 1, x2, y2, fill="", outline=self.ops.header_fg)
         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 = (
@@ -1400,17 +1392,9 @@ class ColumnHeaders(tk.Canvas):
                 if sh:
                     self.itemconfig(t, fill=fill)
                 else:
-                    self.itemconfig(t, fill=fill, tag=tag, state="normal")
-                self.lift(t)
+                    self.itemconfig(t, fill=fill, state="normal")
             else:
-                t = self.create_line(
-                    points,
-                    fill=fill,
-                    tag=tag,
-                    width=2,
-                    capstyle=tk.ROUND,
-                    joinstyle=tk.BEVEL,
-                )
+                t = self.create_line(points, fill=fill, width=2, capstyle=tk.ROUND, joinstyle=tk.BEVEL, tag="lift")
             self.disp_dropdown[t] = True
 
     def redraw_checkbox(
@@ -1421,7 +1405,6 @@ class ColumnHeaders(tk.Canvas):
         y2: float,
         fill: str,
         outline: str,
-        tag: str | tuple[str],
         draw_check: bool = False,
     ) -> None:
         points = rounded_box_coords(x1, y1, x2, y2)
@@ -1431,10 +1414,9 @@ class ColumnHeaders(tk.Canvas):
             if sh:
                 self.itemconfig(t, fill=outline, outline=fill)
             else:
-                self.itemconfig(t, fill=outline, outline=fill, tag=tag, state="normal")
-            self.lift(t)
+                self.itemconfig(t, fill=outline, outline=fill, state="normal")
         else:
-            t = self.create_polygon(points, fill=outline, outline=fill, tag=tag, smooth=True)
+            t = self.create_polygon(points, fill=outline, outline=fill, smooth=True, tag="lift")
         self.disp_checkbox[t] = True
         if draw_check:
             # draw filled box
@@ -1449,10 +1431,9 @@ class ColumnHeaders(tk.Canvas):
                 if sh:
                     self.itemconfig(t, fill=fill, outline=outline)
                 else:
-                    self.itemconfig(t, fill=fill, outline=outline, tag=tag, state="normal")
-                self.lift(t)
+                    self.itemconfig(t, fill=fill, outline=outline, state="normal")
             else:
-                t = self.create_polygon(points, fill=fill, outline=outline, tag=tag, smooth=True)
+                t = self.create_polygon(points, fill=fill, outline=outline, smooth=True, tag="lift")
             self.disp_checkbox[t] = True
 
     def configure_scrollregion(self, last_col_line_pos: float) -> bool:
@@ -1470,15 +1451,15 @@ class ColumnHeaders(tk.Canvas):
             return False
 
     def wrap_get_char_w(self, c: str) -> int:
-        self.MT.txt_measure_canvas.itemconfig(
-            self.MT.txt_measure_canvas_text,
-            text=_test_str + c,
-            font=self.header_font,
-        )
-        b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
         if c in self.MT.char_widths[self.header_font]:
             return self.MT.char_widths[self.header_font][c]
         else:
+            self.MT.txt_measure_canvas.itemconfig(
+                self.MT.txt_measure_canvas_text,
+                text=_test_str + c,
+                font=self.header_font,
+            )
+            b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
             wd = b[2] - b[0] - self.header_test_str_w
             self.MT.char_widths[self.header_font][c] = wd
             return wd
@@ -1516,6 +1497,35 @@ class ColumnHeaders(tk.Canvas):
             self.current_height,
         )
         top = self.canvasy(0)
+
+        if (self.ops.show_vertical_grid or self.width_resizing_enabled) and col_pos_exists:
+            yend = self.current_height - 5
+            points = [
+                x_stop - 1,
+                self.current_height - 1,
+                scrollpos_left - 1,
+                self.current_height - 1,
+                scrollpos_left - 1,
+                -1,
+            ]
+            for c in range(grid_start_col, grid_end_col):
+                draw_x = self.MT.col_positions[c]
+                if c and self.width_resizing_enabled:
+                    self.visible_col_dividers[c] = (draw_x - 2, 1, draw_x + 2, yend)
+                points.extend(
+                    (
+                        draw_x,
+                        -1,
+                        draw_x,
+                        self.current_height,
+                        draw_x,
+                        -1,
+                        self.MT.col_positions[c + 1] if len(self.MT.col_positions) - 1 > c else draw_x,
+                        -1,
+                    )
+                )
+            self.redraw_gridline(points=points, fill=self.ops.header_grid_fg, width=1)
+
         sel_cols_bg = (
             self.ops.header_selected_cells_bg
             if self.ops.header_selected_cells_bg.startswith("#")
@@ -1552,13 +1562,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,
@@ -1566,25 +1576,24 @@ class ColumnHeaders(tk.Canvas):
                     self.current_height - 1,
                     fill=fill if kwargs["state"] != "disabled" else self.ops.header_grid_fg,
                     outline=fill,
-                    tag="dd",
                     draw_outline=not dd_drawn,
                     draw_arrow=max_width >= 5,
                     open_=dd_coords == c,
                 )
             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 = (
@@ -1601,35 +1610,34 @@ class ColumnHeaders(tk.Canvas):
                         txt_h + 3,
                         fill=fill if kwargs["state"] == "normal" else self.ops.header_grid_fg,
                         outline="",
-                        tag="cb",
                         draw_check=draw_check,
                     )
             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)
             if not text:
                 continue
-            max_lines = int((self.current_height - top - 2) / txt_h)
-            for wrapped in wrap_text(
+            gen_lines = wrap_text(
                 text=text,
                 max_width=max_width,
-                max_lines=max_lines,
+                max_lines=int((self.current_height - top - 2) / txt_h),
                 char_width_fn=self.wrap_get_char_w,
                 widths=self.MT.char_widths[font],
                 wrap=wrap,
-            ):
+            )
+            if align[-1] == "w" or align[-1] == "e":
                 if self.hidd_text:
                     iid, showing = self.hidd_text.popitem()
                     self.coords(iid, draw_x, draw_y)
                     if showing:
                         self.itemconfig(
                             iid,
-                            text=wrapped,
+                            text="\n".join(gen_lines),
                             fill=fill,
                             font=font,
                             anchor=align,
@@ -1637,7 +1645,7 @@ class ColumnHeaders(tk.Canvas):
                     else:
                         self.itemconfig(
                             iid,
-                            text=wrapped,
+                            text="\n".join(gen_lines),
                             fill=fill,
                             font=font,
                             anchor=align,
@@ -1647,47 +1655,54 @@ class ColumnHeaders(tk.Canvas):
                     iid = self.create_text(
                         draw_x,
                         draw_y,
-                        text=wrapped,
+                        text="\n".join(gen_lines),
                         fill=fill,
                         font=font,
                         anchor=align,
-                        tags="t",
+                        tag="lift",
                     )
                 self.disp_text[iid] = True
-                draw_y += self.MT.header_txt_height
-        yend = self.current_height - 5
-        if (self.ops.show_vertical_grid or self.width_resizing_enabled) and col_pos_exists:
-            points = [
-                x_stop - 1,
-                self.current_height - 1,
-                scrollpos_left - 1,
-                self.current_height - 1,
-                scrollpos_left - 1,
-                -1,
-            ]
-            for c in range(grid_start_col, grid_end_col):
-                draw_x = self.MT.col_positions[c]
-                if c and self.width_resizing_enabled:
-                    self.visible_col_dividers[c] = (draw_x - 2, 1, draw_x + 2, yend)
-                points.extend(
-                    (
-                        draw_x,
-                        -1,
-                        draw_x,
-                        self.current_height,
-                        draw_x,
-                        -1,
-                        self.MT.col_positions[c + 1] if len(self.MT.col_positions) - 1 > c else draw_x,
-                        -1,
-                    )
-                )
-            self.redraw_gridline(points=points, fill=self.ops.header_grid_fg, width=1, tag="v")
+            else:
+                for line in gen_lines:
+                    if self.hidd_text:
+                        iid, showing = self.hidd_text.popitem()
+                        self.coords(iid, draw_x, draw_y)
+                        if showing:
+                            self.itemconfig(
+                                iid,
+                                text=line,
+                                fill=fill,
+                                font=font,
+                                anchor=align,
+                            )
+                        else:
+                            self.itemconfig(
+                                iid,
+                                text=line,
+                                fill=fill,
+                                font=font,
+                                anchor=align,
+                                state="normal",
+                            )
+                    else:
+                        iid = self.create_text(
+                            draw_x,
+                            draw_y,
+                            text=line,
+                            fill=fill,
+                            font=font,
+                            anchor=align,
+                            tag="lift",
+                        )
+                    self.disp_text[iid] = True
+                    draw_y += self.MT.header_txt_height
+
         for dct in (self.hidd_text, self.hidd_high, self.hidd_grid, self.hidd_dropdown, self.hidd_checkbox):
             for iid, showing in dct.items():
                 if showing:
                     self.itemconfig(iid, state="hidden")
                     dct[iid] = False
-        self.tag_raise("t")
+        self.tag_raise("lift")
         if self.disp_resize_lines:
             self.tag_raise("rw")
         return True

{tksheet-7.4.12 → tksheet-7.4.14}/tksheet/find_window.py

@@ -317,6 +317,8 @@ class FindWindow(tk.Frame):
         return "break"
 
     def focus_replace(self, event: tk.Misc = None) -> Literal["break"]:
+        if self.replace_enabled and not self.replace_visible:
+            self.toggle_replace_window()
         widget = self.focus_get()
         if widget == self.replace_tktext:
             self.replace_tktext.select_all()

{tksheet-7.4.12 → tksheet-7.4.14}/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):