tksheet 7.2.16__py3-none-any.whl → 7.2.17__py3-none-any.whl

tksheet/__init__.py

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

tksheet/row_index.py

@@ -925,7 +925,7 @@ class RowIndex(tk.Canvas):
             and isinstance(self.MT._row_index, list)
             and (datarn := self.MT.datarn(r)) < len(self.MT._row_index)
             and eventx
-            < (indent := self.get_treeview_indent((iid := self.MT._row_index[datarn].iid))) + self.MT.index_txt_height + 4
+            < (indent := self.get_iid_indent((iid := self.MT._row_index[datarn].iid))) + self.MT.index_txt_height + 4
             and eventx >= indent + 1
         ):
             return iid
@@ -1057,7 +1057,7 @@ class RowIndex(tk.Canvas):
                 align = self.align
             if align == "w":
                 w += self.MT.index_txt_height
-            w += self.get_treeview_indent(self.MT._row_index[datarn].iid) + 10
+            w += self.get_iid_indent(self.MT._row_index[datarn].iid) + 10
         return w, h
 
     def get_row_text_height(
@@ -1332,12 +1332,13 @@ class RowIndex(tk.Canvas):
         self,
         x1: float,
         y1: float,
-        r: int,
+        y2: float,
         fill: str,
         tag: str | tuple[str],
         indent: float,
         has_children: bool = False,
         open_: bool = False,
+        level: int = 1,
     ) -> None:
         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)
@@ -1370,14 +1371,36 @@ class RowIndex(tk.Canvas):
                     y1 + mid_y + small_mod + small_mod,
                 )
         else:
+            # POINTS FOR A LINE THAT STOPS BELOW FIRST LINE OF TEXT
+            # points = (
+            #     # the upper point
+            #     x1 + 5 + indent + small_mod + small_mod,
+            #     y1 + mid_y - small_mod - small_mod,
+            #     # the bottom point
+            #     x1 + 5 + indent + small_mod + small_mod,
+            #     y1 + mid_y + small_mod + small_mod,
+            # )
+            
+            # POINTS FOR A LINE THAT STOPS AT ROW LINE
+            # points = (
+            #     # the upper point
+            #     x1 + 5 + indent + small_mod + small_mod,
+            #     y1 + mid_y - small_mod - small_mod,
+            #     # the bottom point
+            #     x1 + 5 + indent + small_mod + small_mod,
+            #     y2 - mid_y + small_mod + small_mod,
+            # )
+            
+            # POINTS FOR A HORIZONTAL LINE
             points = (
-                # the upper point
-                x1 + 5 + indent + small_mod + small_mod,
-                y1 + mid_y - small_mod - small_mod,
-                # the bottom point
-                x1 + 5 + indent + small_mod + small_mod,
-                y1 + mid_y + small_mod + small_mod,
+                # the left point
+                x1 + 5 + indent,
+                y1 + mid_y,
+                # the right point
+                x1 + 5 + indent + small_mod + small_mod + small_mod + small_mod,
+                y1 + mid_y,
             )
+            
         if self.hidd_tree_arrow:
             t, sh = self.hidd_tree_arrow.popitem()
             self.coords(t, points)
@@ -1697,17 +1720,18 @@ class RowIndex(tk.Canvas):
                 mw -= self.MT.index_txt_height
                 if align == "w":
                     draw_x += self.MT.index_txt_height + 3
-                indent = self.get_treeview_indent(iid)
+                level, indent = self.get_iid_level_indent(iid)
                 draw_x += indent + 5
                 self.redraw_tree_arrow(
                     2,
                     rtopgridln,
-                    r=r,
+                    rbotgridln - 1,
                     fill=tree_arrow_fg,
                     tag="ta",
                     indent=indent,
                     has_children=bool(self.tree[iid].children),
                     open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
+                    level=level,
                 )
             lns = self.get_valid_cell_data_as_str(datarn, fix=False)
             if not lns:
@@ -2518,13 +2542,21 @@ class RowIndex(tk.Canvas):
     def gen_top_nodes(self) -> Generator[Node]:
         yield from (node for node in self.MT._row_index if node.parent == "")
 
-    def get_treeview_indent(self, iid: str) -> int:
+    def get_iid_indent(self, iid: str) -> int:
         if isinstance(self.PAR.ops.treeview_indent, str):
             indent = self.MT.index_txt_width * int(self.PAR.ops.treeview_indent)
         else:
             indent = self.PAR.ops.treeview_indent
         return indent * max(self.get_node_level(self.tree[iid]))
 
+    def get_iid_level_indent(self, iid: str) -> tuple[int, int]:
+        if isinstance(self.PAR.ops.treeview_indent, str):
+            indent = self.MT.index_txt_width * int(self.PAR.ops.treeview_indent)
+        else:
+            indent = self.PAR.ops.treeview_indent
+        level = max(self.get_node_level(self.tree[iid]))
+        return level, indent * level
+
     def remove_node_from_parents_children(self, node: Node) -> None:
         if node.parent:
             node.parent.children.remove(node)

tksheet/sheet.py

@@ -193,7 +193,7 @@ class Sheet(tk.Frame):
         edit_cell_return: Literal["right", "down", ""] = "down",
         editor_del_key: Literal["forward", "backward", ""] = "forward",
         treeview: bool = False,
-        treeview_indent: str | int = "6",
+        treeview_indent: str | int = "5",
         rounded_boxes: bool = True,
         alternate_color: str = "",
         # colors
@@ -4709,7 +4709,7 @@ class Sheet(tk.Frame):
         data: list[list[object]],
         iid_column: int,
         parent_column: int,
-        text_column: None | int = None,
+        text_column: None | int | list[str] = None,
         push_ops: bool = False,
         row_heights: Sequence[int] | None | False = None,
         open_ids: Iterator[str] | None = None,
@@ -4741,15 +4741,15 @@ class Sheet(tk.Frame):
                     tally_of_ids[iid] += 1
                     row[iid_column] = new
             if iid in self.RI.tree:
-                self.RI.tree[iid].text = row[text_column]
+                self.RI.tree[iid].text = row[text_column] if isinstance(text_column, int) else text_column[rn]
             else:
-                self.RI.tree[iid] = Node(row[text_column], iid, "")
+                self.RI.tree[iid] = Node(row[text_column] if isinstance(text_column, int) else text_column[rn], iid, "")
             if safety and (iid == pid or self.RI.build_pid_causes_recursive_loop(iid, pid)):
                 row[parent_column] = ""
                 pid = ""
             if pid:
                 if pid not in self.RI.tree:
-                    self.RI.tree[pid] = Node(row[text_column], pid)
+                    self.RI.tree[pid] = Node(row[text_column] if isinstance(text_column, int) else text_column[rn], pid)
                 self.RI.tree[iid].parent = self.RI.tree[pid]
                 self.RI.tree[pid].children.append(self.RI.tree[iid])
             else:

{tksheet-7.2.16.dist-info → tksheet-7.2.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.16
+Version: 7.2.17
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -83,7 +83,7 @@ This library is maintained with the help of **[others](https://github.com/ragard
 - Change fonts and font size (not for individual cells)
 - Change any colors in the sheet
 - Dropdowns, check boxes, progress bars
-- Treeview mode
+- [Treeview mode](https://github.com/ragardner/tksheet/wiki/Version-7#treeview-mode)
 - [Hide rows and/or columns](https://github.com/ragardner/tksheet/wiki/Version-7#example-header-dropdown-boxes-and-row-filtering)
 - Left `"w"`, Center `"center"` or Right `"e"` text alignment for any cell/row/column
 
@@ -114,4 +114,7 @@ sheet.delete_columns(columns=[0, 3], undo=True)
 
 ### **treeview mode**
 
-![tksheet treeview](https://github.com/user-attachments/assets/201f2d9d-7ffb-43e2-81ba-91da806aaab0)
+![tksheet treeview](https://github.com/user-attachments/assets/159ab987-7612-4db7-98de-1f30c9680247)
+
+
+

{tksheet-7.2.16.dist-info → tksheet-7.2.17.dist-info}/RECORD

@@ -1,20 +1,20 @@
-tksheet/__init__.py,sha256=X3AZkLmfPiFkqbcT_7zxfzR3WmneO3LBwgt1XFoPlck,2165
+tksheet/__init__.py,sha256=TDIJBK7_SlAbZEGQyaWByzoFyx9741bcSAEQHnD_Rms,2165
 tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
 tksheet/column_headers.py,sha256=bHv67vRhRYxw_qyrw5akJo-b77vtN4y-mEO617FEqxE,102222
 tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
 tksheet/functions.py,sha256=wTWsTFZkTMJH-2qz--9qNaprWqhA7sYVzCEhuw_PRhs,42369
 tksheet/main_table.py,sha256=WeSemTwFb8zEu0v2QabPNGZqM06kkCs-IvP1HLSR1oM,328843
 tksheet/other_classes.py,sha256=HIKIDNXJRv0H5qbftcCtLVWW8NKSBAwyNXQOlmPWTDQ,15633
-tksheet/row_index.py,sha256=VVM9rs0ShHfWdy_J-fr4Oz6zDpsKrQWY5Yo6KmZWs0s,109680
-tksheet/sheet.py,sha256=41b3rCcGpli_zD5js91r8Ml59fWp272mdCDOy1VDCC8,276904
+tksheet/row_index.py,sha256=kEdlyPaSeTFGhEwKMN57jH61WMN5fX91Xi3EnR1x8Ws,110974
+tksheet/sheet.py,sha256=3U5E7k9_LdRKmTmEX_WBuPVPuTWYY5SzRY0OTiRIgXQ,277075
 tksheet/sheet_options.py,sha256=hA4Gi2spLmltq3HrgfzetUaqvT_FaVI8PrSQkgdoyEE,12442
 tksheet/text_editor.py,sha256=lmmHOPb11S8tlNtC10vijF1QqVB5Ts2hUKnGJd_JkWA,7103
 tksheet/themes.py,sha256=ZO4RqnAhEpApsoA5ZGUkYvb7huaNHSmrV_ug2TWWzOE,14474
 tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
 tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
 tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
-tksheet-7.2.16.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.2.16.dist-info/METADATA,sha256=3MazU2uACyAR_E5Fkdn4HFmcuovzLfcBH2Udv1zV9PA,6404
-tksheet-7.2.16.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-tksheet-7.2.16.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.2.16.dist-info/RECORD,,
+tksheet-7.2.17.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.2.17.dist-info/METADATA,sha256=9Alc-s77Mb9MEJR4TIcAUQ8zM4h1hJCztLUEEB7uxMw,6476
+tksheet-7.2.17.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+tksheet-7.2.17.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.2.17.dist-info/RECORD,,