tksheet 7.4.13__py3-none-any.whl → 7.4.14__py3-none-any.whl

tksheet/row_index.py

@@ -7,7 +7,7 @@ from contextlib import suppress
 from functools import partial
 from itertools import cycle, islice, repeat
 from math import ceil
-from operator import itemgetter
+from re import findall
 from typing import Any, Literal
 
 from .colors import color_map
@@ -1058,14 +1058,16 @@ class RowIndex(tk.Canvas):
     def get_cell_dimensions(self, datarn: int) -> tuple[int, int]:
         txt = self.cell_str(datarn, fix=False)
         if txt:
-            self.MT.txt_measure_canvas.itemconfig(self.MT.txt_measure_canvas_text, text=txt, font=self.ops.index_font)
-            b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
-            w = b[2] - b[0] + 7
-            h = b[3] - b[1] + 5
+            lines = findall(r"[^\n]+", txt)
+            h = self.MT.index_txt_height * len(lines) + 5
+            w = max(sum(self.wrap_get_char_w(c) for c in line) for line in lines) + 8
         else:
             w = self.ops.default_row_index_width
             h = self.MT.min_row_height
-        if self.get_cell_kwargs(datarn, key="dropdown") or self.get_cell_kwargs(datarn, key="checkbox"):
+        # self.get_cell_kwargs not used here to boost performance
+        if (datarn in self.cell_options and "dropdown" in self.cell_options[datarn]) or (
+            datarn in self.cell_options and "checkbox" in self.cell_options[datarn]
+        ):
             w += self.MT.index_txt_height + 2
         if self.ops.treeview:
             if datarn in self.cell_options and "align" in self.cell_options[datarn]:
@@ -1077,6 +1079,27 @@ class RowIndex(tk.Canvas):
             w += self.get_iid_indent(self.MT._row_index[datarn].iid) + 10
         return w, h
 
+    def get_cell_width(self, datarn: int) -> int:
+        txt = self.cell_str(datarn, fix=False)
+        if txt:
+            w = max(sum(self.wrap_get_char_w(c) for c in line) for line in findall(r"[^\n]+", txt)) + 8
+        else:
+            w = self.ops.default_row_index_width
+        # self.get_cell_kwargs not used here to boost performance
+        if (datarn in self.cell_options and "dropdown" in self.cell_options[datarn]) or (
+            datarn in self.cell_options and "checkbox" in self.cell_options[datarn]
+        ):
+            w += self.MT.index_txt_height + 2
+        if self.ops.treeview:
+            if datarn in self.cell_options and "align" in self.cell_options[datarn]:
+                align = self.cell_options[datarn]["align"]
+            else:
+                align = self.align
+            if align[-1] == "w":
+                w += self.MT.index_txt_height
+            w += self.get_iid_indent(self.MT._row_index[datarn].iid) + 10
+        return w
+
     def get_wrapped_cell_height(self, datarn: int) -> int:
         n_lines = max(
             1,
@@ -1161,10 +1184,7 @@ class RowIndex(tk.Canvas):
             self.MT.recreate_all_selection_boxes()
         return height
 
-    def get_index_text_width(
-        self,
-        only_rows: Iterator[int] | None = None,
-    ) -> int:
+    def get_index_text_width(self, only_rows: Iterator[int] | None = None) -> int:
         self.fix_index()
         w = self.ops.default_row_index_width
         if (not self.MT._row_index and isinstance(self.MT._row_index, list)) or (
@@ -1180,7 +1200,7 @@ class RowIndex(tk.Canvas):
                 iterable = range(len(self.MT.data))
         else:
             iterable = self.MT.displayed_rows
-        if (new_w := max(map(itemgetter(0), map(self.get_cell_dimensions, iterable)), default=w)) > w:
+        if (new_w := max(map(self.get_cell_width, iterable), default=w)) > w:
             w = new_w
         if w > self.ops.max_index_width:
             w = int(self.ops.max_index_width)
@@ -1235,11 +1255,11 @@ class RowIndex(tk.Canvas):
     def auto_set_index_width(self, end_row: int, only_rows: list) -> bool:
         if not isinstance(self.MT._row_index, int) and not self.MT._row_index:
             if self.ops.default_row_index == "letters":
-                new_w = self.MT.get_txt_w(f"{num2alpha(end_row)}", self.index_font) + 20
+                new_w = sum(self.wrap_get_char_w(c) for c in num2alpha(end_row)) + 20
             elif self.ops.default_row_index == "numbers":
-                new_w = self.MT.get_txt_w(f"{end_row}", self.index_font) + 20
+                new_w = sum(self.wrap_get_char_w(c) for c in str(end_row)) + 20
             elif self.ops.default_row_index == "both":
-                new_w = self.MT.get_txt_w(f"{end_row + 1} {num2alpha(end_row)}", self.index_font) + 20
+                new_w = sum(self.wrap_get_char_w(c) for c in f"{end_row + 1} {num2alpha(end_row)}") + 20
             elif self.ops.default_row_index is None:
                 new_w = 20
         elif self.ops.auto_resize_row_index is True:
@@ -1306,7 +1326,6 @@ class RowIndex(tk.Canvas):
                     sr,
                     fill=fill,
                     outline=self.ops.index_fg if has_dd and self.ops.show_dropdown_borders else "",
-                    tag="s",
                 )
             tree_arrow_fg = txtfg
         elif not kwargs:
@@ -1320,7 +1339,6 @@ class RowIndex(tk.Canvas):
                     sr,
                     fill=self.ops.index_selected_rows_bg,
                     outline=self.ops.index_fg if has_dd and self.ops.show_dropdown_borders else "",
-                    tag="s",
                 )
             elif "cells" in selections and r in selections["cells"]:
                 txtfg = self.ops.index_selected_cells_fg
@@ -1332,7 +1350,6 @@ class RowIndex(tk.Canvas):
                     sr,
                     fill=self.ops.index_selected_cells_bg,
                     outline=self.ops.index_fg if has_dd and self.ops.show_dropdown_borders else "",
-                    tag="s",
                 )
             else:
                 txtfg = self.ops.index_fg
@@ -1347,7 +1364,6 @@ class RowIndex(tk.Canvas):
         y2: float,
         fill: str,
         outline: str,
-        tag: str | tuple[str],
     ) -> bool:
         coords = (x1, y1, x2, y2)
         if self.hidd_high:
@@ -1356,10 +1372,9 @@ class RowIndex(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
 
@@ -1368,18 +1383,17 @@ class RowIndex(tk.Canvas):
         points: tuple[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
         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_tree_arrow(
         self,
@@ -1387,7 +1401,6 @@ class RowIndex(tk.Canvas):
         y1: float,
         y2: float,
         fill: str,
-        tag: str | tuple[str],
         indent: float,
         has_children: bool = False,
         open_: bool = False,
@@ -1460,16 +1473,15 @@ class RowIndex(tk.Canvas):
             if sh:
                 self.itemconfig(t, fill=fill if has_children else self.ops.index_grid_fg)
             else:
-                self.itemconfig(t, fill=fill if has_children else self.ops.index_grid_fg, tag=tag, state="normal")
-            self.lift(t)
+                self.itemconfig(t, fill=fill if has_children else self.ops.index_grid_fg, state="normal")
         else:
             t = self.create_line(
                 points,
                 fill=fill if has_children else self.ops.index_grid_fg,
-                tag=tag,
                 width=2,
                 capstyle=tk.ROUND,
                 joinstyle=tk.BEVEL,
+                tag="lift",
             )
         self.disp_tree_arrow[t] = True
 
@@ -1481,13 +1493,12 @@ class RowIndex(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.index_fg, tag=tag)
+            self.redraw_highlight(x1 + 1, y1 + 1, x2, y2, fill="", outline=self.ops.index_fg)
         if draw_arrow:
             mod = (self.MT.index_txt_height - 1) if self.MT.index_txt_height % 2 else self.MT.index_txt_height
             small_mod = int(mod / 5)
@@ -1518,16 +1529,15 @@ class RowIndex(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,
+                    tag="lift",
                 )
             self.disp_dropdown[t] = True
 
@@ -1539,7 +1549,6 @@ class RowIndex(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)
@@ -1549,10 +1558,9 @@ class RowIndex(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
@@ -1567,10 +1575,9 @@ class RowIndex(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_row_line_pos: float) -> bool:
@@ -1588,15 +1595,15 @@ class RowIndex(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.index_font,
-        )
-        b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
         if c in self.MT.char_widths[self.index_font]:
             return self.MT.char_widths[self.index_font][c]
         else:
+            self.MT.txt_measure_canvas.itemconfig(
+                self.MT.txt_measure_canvas_text,
+                text=_test_str + c,
+                font=self.index_font,
+            )
+            b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
             wd = b[2] - b[0] - self.index_test_str_w
             self.MT.char_widths[self.index_font][c] = wd
             return wd
@@ -1635,6 +1642,35 @@ class RowIndex(tk.Canvas):
             self.current_width,
             scrollpos_bot,
         )
+
+        if (self.ops.show_horizontal_grid or self.height_resizing_enabled) and row_pos_exists:
+            xend = self.current_width - 6
+            points = [
+                self.current_width - 1,
+                y_stop - 1,
+                self.current_width - 1,
+                scrollpos_top - 1,
+                -1,
+                scrollpos_top - 1,
+            ]
+            for r in range(grid_start_row, grid_end_row):
+                draw_y = self.MT.row_positions[r]
+                if r and self.height_resizing_enabled:
+                    self.visible_row_dividers[r] = (1, draw_y - 2, xend, draw_y + 2)
+                points.extend(
+                    (
+                        -1,
+                        draw_y,
+                        self.current_width,
+                        draw_y,
+                        -1,
+                        draw_y,
+                        -1,
+                        self.MT.row_positions[r + 1] if len(self.MT.row_positions) - 1 > r else draw_y,
+                    )
+                )
+            self.redraw_gridline(points=points, fill=self.ops.index_grid_fg, width=1)
+
         sel_cells_bg = (
             self.ops.index_selected_cells_bg
             if self.ops.index_selected_cells_bg.startswith("#")
@@ -1688,7 +1724,6 @@ class RowIndex(tk.Canvas):
                     rbotgridln - 1,
                     fill=fill if dropdown_kwargs["state"] != "disabled" else self.ops.index_grid_fg,
                     outline=fill,
-                    tag="dd",
                     draw_outline=not dd_drawn,
                     draw_arrow=True,
                     open_=dd_coords == r,
@@ -1727,7 +1762,6 @@ class RowIndex(tk.Canvas):
                         rtopgridln + self.MT.index_txt_height + 3,
                         fill=fill if checkbox_kwargs["state"] == "normal" else self.ops.index_grid_fg,
                         outline="",
-                        tag="cb",
                         draw_check=draw_check,
                     )
             if treeview and isinstance(self.MT._row_index, list) and len(self.MT._row_index) > datarn:
@@ -1742,7 +1776,6 @@ class RowIndex(tk.Canvas):
                     rtopgridln,
                     rbotgridln - 1,
                     fill=tree_arrow_fg,
-                    tag="ta",
                     indent=indent,
                     has_children=bool(self.MT._row_index[datarn].children),
                     open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
@@ -1764,7 +1797,7 @@ class RowIndex(tk.Canvas):
                 wrap=wrap,
                 start_line=start_line,
             )
-            if align.endswith(("w", "e")):
+            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)
@@ -1793,18 +1826,18 @@ class RowIndex(tk.Canvas):
                         fill=fill,
                         font=font,
                         anchor=align,
-                        tags="t",
+                        tag="lift",
                     )
                 self.disp_text[iid] = True
             else:
-                for text in gen_lines:
+                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=text,
+                                text=line,
                                 fill=fill,
                                 font=font,
                                 anchor=align,
@@ -1812,7 +1845,7 @@ class RowIndex(tk.Canvas):
                         else:
                             self.itemconfig(
                                 iid,
-                                text=text,
+                                text=line,
                                 fill=fill,
                                 font=font,
                                 anchor=align,
@@ -1822,42 +1855,15 @@ class RowIndex(tk.Canvas):
                         iid = self.create_text(
                             draw_x,
                             draw_y,
-                            text=text,
+                            text=line,
                             fill=fill,
                             font=font,
                             anchor=align,
-                            tags="t",
+                            tag="lift",
                         )
                     self.disp_text[iid] = True
                     draw_y += self.MT.header_txt_height
 
-        xend = self.current_width - 6
-        if (self.ops.show_horizontal_grid or self.height_resizing_enabled) and row_pos_exists:
-            points = [
-                self.current_width - 1,
-                y_stop - 1,
-                self.current_width - 1,
-                scrollpos_top - 1,
-                -1,
-                scrollpos_top - 1,
-            ]
-            for r in range(grid_start_row, grid_end_row):
-                draw_y = self.MT.row_positions[r]
-                if r and self.height_resizing_enabled:
-                    self.visible_row_dividers[r] = (1, draw_y - 2, xend, draw_y + 2)
-                points.extend(
-                    (
-                        -1,
-                        draw_y,
-                        self.current_width,
-                        draw_y,
-                        -1,
-                        draw_y,
-                        -1,
-                        self.MT.row_positions[r + 1] if len(self.MT.row_positions) - 1 > r else draw_y,
-                    )
-                )
-            self.redraw_gridline(points=points, fill=self.ops.index_grid_fg, width=1, tag="h")
         for dct in (
             self.hidd_text,
             self.hidd_high,
@@ -1870,7 +1876,7 @@ class RowIndex(tk.Canvas):
                 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("rh")
         return True

tksheet/sheet.py

@@ -1726,12 +1726,14 @@ class Sheet(tk.Frame):
             len_check = (total_cols + 1) if row_index else total_cols
             for rn, r in enumerate(rows):
                 if len_check > (lnr := len(r)):
-                    r += self.MT.get_empty_row_seq(
-                        rn,
-                        end=total_cols,
-                        start=(lnr - 1) if row_index else lnr,
-                        r_ops=False,
-                        c_ops=False,
+                    r.extend(
+                        self.MT.gen_empty_row_seq(
+                            rn,
+                            end=total_cols,
+                            start=(lnr - 1) if row_index else lnr,
+                            r_ops=False,
+                            c_ops=False,
+                        )
                     )
         event_data = self.MT.add_rows(
             *self.MT.get_args_for_add_rows(

{tksheet-7.4.13.dist-info → tksheet-7.4.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.13
+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

{tksheet-7.4.13.dist-info → tksheet-7.4.14.dist-info}/RECORD

@@ -1,22 +1,22 @@
-tksheet/__init__.py,sha256=CdTPPFo67goThv2unHBQc8yvXaJncIkDk6fZVh6jpEk,2327
+tksheet/__init__.py,sha256=3PPVPpSjy9UW907gQGNjDApgWzFv0DikuRVnuAo3nAc,2327
 tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
-tksheet/column_headers.py,sha256=Ztr5QvTo3u9ANbZXheECMzRwZ9KvYnQQu-fncOJfNGg,102657
+tksheet/column_headers.py,sha256=POoLTtR8qvrRYJl1c7WMc6UiDxfoNxhLUC2ikcEzt1M,103446
 tksheet/constants.py,sha256=aiDvUSaPtl_TSNtRRJ_p87c9iTBz9ksMd5IsSXzz4Hk,13316
-tksheet/find_window.py,sha256=TvbSqO42cw1o1AO0tQ0Q1iZogouNr4ObMo7JfkZCxgA,19877
+tksheet/find_window.py,sha256=w6S0FZFLRNHiM57Oq97avALT_PctIBPegSxnkNUwkwk,19982
 tksheet/formatters.py,sha256=DGcRiMsDJnySNpQcjfiX84oJ7TmOSMdU6u9injIhA4g,10095
 tksheet/functions.py,sha256=qks2dLqBE9GMAuEXaA4qiU-rrL-dzmz4-tkmkp6_ETk,53037
-tksheet/main_table.py,sha256=rm1ZeVRXTv-CwxKirFrssjIz4fvrxNH7pw0JAwUOcH4,364840
+tksheet/main_table.py,sha256=dNpljN59pWIQ_QPBUKuZjxJMZw723neMQFkfSAP1sJI,366079
 tksheet/other_classes.py,sha256=B2SrUAviztDUOPGoWkcu-AixqAaKwItshoVZPGe1_Tc,16662
-tksheet/row_index.py,sha256=aQOQh6d4x6bGeu4Kn1KMKU5F9hwSFFinAsh5hddC3Ho,141241
-tksheet/sheet.py,sha256=6XOlCb6uhofSwylInVHk2UYufZn4sHXFsQggJ40uAaE,269689
+tksheet/row_index.py,sha256=a0W78zqZIXVxfzyF5yYfXu1iUXnnDcK0ESodLl6joiA,141720
+tksheet/sheet.py,sha256=nQES3tqopDmmyL7j7YKDjZRdfVVhmgzQ-2srII6COgE,269766
 tksheet/sheet_options.py,sha256=ob-XYgGfBoi2TaFAvUUmlWUkw9xB-yXmJw17gu9__Lw,9948
 tksheet/sorting.py,sha256=zcZPpRtP1h_xJGtGkG3E43H7deKQFnh9cMwZ1B2-aGc,17502
 tksheet/text_editor.py,sha256=rU8Fz0-ltkM63W9io2DoZJPyzUGzCc9Z0qBtc4D1H40,7404
 tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
 tksheet/tksheet_types.py,sha256=1MjXR34EmvP1KfHlLTvKKVnf0VMz_LU_WOM2q4o5hfI,4598
 tksheet/top_left_rectangle.py,sha256=M52IrPIeMoYE3jSpooZmqw_0W5Fz_R-Yu1ZqA685EZ8,8557
-tksheet-7.4.13.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.4.13.dist-info/METADATA,sha256=ch2OK72gHX9RudQZpnF4JuYDE3KyR0OQTvl3WYtJpsw,8095
-tksheet-7.4.13.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-tksheet-7.4.13.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.4.13.dist-info/RECORD,,
+tksheet-7.4.14.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.4.14.dist-info/METADATA,sha256=F1Yoinb1DWdw_m765tlha6ae7vnxGbhw-7wDlE325cw,8095
+tksheet-7.4.14.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+tksheet-7.4.14.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.4.14.dist-info/RECORD,,