tksheet 7.4.11__tar.gz → 7.4.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.11
+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 Wiki</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://github.com/ragardner/tksheet/wiki/Version-7">Documentation Wiki</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.11 → 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 Wiki</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://github.com/ragardner/tksheet/wiki/Version-7">Documentation Wiki</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.11 → 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.11"
+version = "7.4.13"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

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

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

{tksheet-7.4.11 → 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)
@@ -1058,44 +1058,6 @@ class ColumnHeaders(tk.Canvas):
             self.MT.run_selection_binding("columns")
         return fill_iid
 
-    def display_box(
-        self,
-        x1: int,
-        y1: int,
-        x2: int,
-        y2: int,
-        fill: str,
-        outline: str,
-        state: str,
-        tags: str | tuple[str],
-        iid: None | int = None,
-    ) -> int:
-        coords = rounded_box_coords(
-            x1,
-            y1,
-            x2,
-            y2,
-            radius=5 if self.ops.rounded_boxes else 0,
-        )
-        if isinstance(iid, int):
-            self.coords(iid, coords)
-            self.itemconfig(iid, fill=fill, outline=outline, state=state, tags=tags)
-        else:
-            if self.hidd_boxes:
-                iid = self.hidd_boxes.pop()
-                self.coords(iid, coords)
-                self.itemconfig(iid, fill=fill, outline=outline, state=state, tags=tags)
-            else:
-                iid = self.create_polygon(coords, fill=fill, outline=outline, state=state, tags=tags, smooth=True)
-            self.disp_boxes.add(iid)
-        return iid
-
-    def hide_box(self, item: int) -> None:
-        if isinstance(item, int):
-            self.disp_boxes.discard(item)
-            self.hidd_boxes.add(item)
-            self.itemconfig(item, state="hidden")
-
     def get_cell_dimensions(self, datacn: int) -> tuple[int, int]:
         txt = self.cell_str(datacn, fix=False)
         if txt:
@@ -1279,6 +1241,7 @@ class ColumnHeaders(tk.Canvas):
         sel_cols_bg: str,
         selections: dict,
         datacn: int,
+        has_dd: bool,
     ) -> tuple[str, bool]:
         redrawn = False
         kwargs = self.get_cell_kwargs(datacn, key="highlight")
@@ -1319,18 +1282,32 @@ class ColumnHeaders(tk.Canvas):
                     sc,
                     self.current_height - 1,
                     fill=fill,
-                    outline=(
-                        self.ops.header_fg
-                        if self.get_cell_kwargs(datacn, key="dropdown") and self.ops.show_dropdown_borders
-                        else ""
-                    ),
+                    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"]:
                 txtfg = self.ops.header_selected_columns_fg
+                redrawn = self.redraw_highlight(
+                    fc + 1,
+                    0,
+                    sc,
+                    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
+                redrawn = self.redraw_highlight(
+                    fc + 1,
+                    0,
+                    sc,
+                    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
         return txtfg, redrawn
@@ -1396,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 = (
@@ -1559,6 +1536,7 @@ class ColumnHeaders(tk.Canvas):
             cleftgridln = self.MT.col_positions[c]
             crightgridln = self.MT.col_positions[c + 1]
             datacn = c if self.MT.all_columns_displayed else self.MT.displayed_columns[c]
+            kwargs = self.get_cell_kwargs(datacn, key="dropdown")
             fill, dd_drawn = self.redraw_highlight_get_text_fg(
                 fc=cleftgridln,
                 sc=crightgridln,
@@ -1567,19 +1545,20 @@ class ColumnHeaders(tk.Canvas):
                 sel_cols_bg=sel_cols_bg,
                 selections=selections,
                 datacn=datacn,
+                has_dd=bool(kwargs),
             )
             if datacn in self.cell_options and "align" in self.cell_options[datacn]:
                 align = self.cell_options[datacn]["align"]
             else:
                 align = self.align
-            if kwargs := self.get_cell_kwargs(datacn, key="dropdown"):
-                max_width = crightgridln - cleftgridln - txt_h - 2
-                if align.endswith("w"):
+            if kwargs:
+                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,
@@ -1594,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 = (
@@ -1627,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)
@@ -1664,7 +1643,6 @@ class ColumnHeaders(tk.Canvas):
                             anchor=align,
                             state="normal",
                         )
-                    self.tag_raise(iid)
                 else:
                     iid = self.create_text(
                         draw_x,
@@ -1709,6 +1687,7 @@ class ColumnHeaders(tk.Canvas):
                 if showing:
                     self.itemconfig(iid, state="hidden")
                     dct[iid] = False
+        self.tag_raise("t")
         if self.disp_resize_lines:
             self.tag_raise("rw")
         return True
@@ -2314,8 +2293,8 @@ class ColumnHeaders(tk.Canvas):
         kwargs = self.get_cell_kwargs(datacn, key=None, cell=c_ops)
         if "checkbox" in kwargs:
             return False
-        elif (kwargs := kwargs.get("dropdown", {})) and kwargs["validate_input"] and kwargs["values"]:
-            return kwargs["values"][0]
+        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
+            return kwargs["dropdown"]["values"][0]
         else:
             return ""
 

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

@@ -9,7 +9,7 @@ from bisect import bisect_left
 from collections import deque
 from collections.abc import Callable, Generator, Hashable, Iterable, Iterator, Sequence
 from difflib import SequenceMatcher
-from itertools import islice, repeat
+from itertools import chain, islice, repeat
 from typing import Any, Literal
 
 from .colors import color_map
@@ -31,34 +31,16 @@ def wrap_text(
     wrap: Literal["", "c", "w"] = "",
     start_line: int = 0,
 ) -> Generator[str]:
-    lines = (match.group() for match in lines_re.finditer(text))
-    current_line = []
     total_lines = 0
     line_width = 0
-
-    if not wrap:
-        for line in lines:
-            line_width = 0
-            current_line = []
-            for char in line:
-                char_width = widths.get(char, char_width_fn(char))
-                line_width += char_width
-                if line_width >= max_width:
-                    break
-                current_line.append(char)
-
-            if total_lines >= start_line:
-                yield "".join(current_line)
-
-            # Count the line whether it's empty or not
-            total_lines += 1
-            if total_lines >= max_lines:
-                return
-
-    elif wrap == "c":
-        for line in lines:
-            for char in line:
-                char_width = widths.get(char, char_width_fn(char))
+    if wrap == "c":
+        current_line = []
+        for match in lines_re.finditer(text):
+            for char in match.group():
+                try:
+                    char_width = widths[char]
+                except KeyError:
+                    char_width = char_width_fn(char)
 
                 # adding char to line would result in wrap
                 if line_width + char_width >= max_width:
@@ -89,11 +71,14 @@ def wrap_text(
             line_width = 0
 
     elif wrap == "w":
-        space_width = widths.get(" ", char_width_fn(" "))
+        try:
+            space_width = widths[" "]
+        except KeyError:
+            space_width = char_width_fn(" ")
+        current_line = []
 
-        for line in lines:
-            words = line.split()
-            for i, word in enumerate(words):
+        for match in lines_re.finditer(text):
+            for i, word in enumerate(match.group().split()):
                 # if we're going to next word and
                 # if a space fits on the end of the current line we add one
                 if i and line_width + space_width < max_width:
@@ -104,8 +89,12 @@ def wrap_text(
                 word_width = 0
                 word_char_widths = []
                 for char in word:
-                    word_char_widths.append((w := widths.get(char, char_width_fn(char))))
-                    word_width += w
+                    try:
+                        char_width = widths[char]
+                    except KeyError:
+                        char_width = char_width_fn(char)
+                    word_char_widths.append(char_width)
+                    word_width += char_width
 
                 # we only wrap by character if the whole word alone wont fit max width
                 # word won't fit at all we resort to char wrapping it
@@ -167,6 +156,28 @@ def wrap_text(
             current_line = []  # Reset for next line
             line_width = 0
 
+    else:
+        for match in lines_re.finditer(text):
+            line_width = 0
+            current_line = []
+            for char in match.group():
+                try:
+                    char_width = widths[char]
+                except KeyError:
+                    char_width = char_width_fn(char)
+                line_width += char_width
+                if line_width >= max_width:
+                    break
+                current_line.append(char)
+
+            if total_lines >= start_line:
+                yield "".join(current_line)
+
+            # Count the line whether it's empty or not
+            total_lines += 1
+            if total_lines >= max_lines:
+                return
+
 
 def get_csv_str_dialect(s: str, delimiters: str) -> csv.Dialect:
     if len(s) > 6000:
@@ -782,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,
@@ -808,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(
@@ -822,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):
@@ -1684,3 +1707,51 @@ def pop_positions(
             save_to[to_pop[i]] = pos
         else:
             yield pos
+
+
+def get_horizontal_gridline_points(
+    left: float,
+    stop: float,
+    positions: list[float],
+    start: int,
+    end: int,
+) -> list[int | float]:
+    return list(
+        chain.from_iterable(
+            (
+                left - 1,
+                positions[r],
+                stop,
+                positions[r],
+                left - 1,
+                positions[r],
+                left - 1,
+                positions[r + 1] if len(positions) - 1 > r else positions[r],
+            )
+            for r in range(start, end)
+        )
+    )
+
+
+def get_vertical_gridline_points(
+    top: float,
+    stop: float,
+    positions: list[float],
+    start: int,
+    end: int,
+) -> list[float]:
+    return list(
+        chain.from_iterable(
+            (
+                positions[c],
+                top - 1,
+                positions[c],
+                stop,
+                positions[c],
+                top - 1,
+                positions[c + 1] if len(positions) - 1 > c else positions[c],
+                top - 1,
+            )
+            for c in range(start, end)
+        )
+    )