tksheet 7.1.20__py3-none-any.whl → 7.1.21__py3-none-any.whl

tksheet/__init__.py

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

tksheet/column_headers.py

@@ -1284,12 +1284,9 @@ class ColumnHeaders(tk.Canvas):
                     self.itemconfig(t, fill=fill, tag=tag, state="normal")
                 self.lift(t)
             else:
-                t = self.create_line(
+                t = self.create_polygon(
                     points,
                     fill=fill,
-                    width=2,
-                    capstyle=tk.ROUND,
-                    joinstyle=tk.ROUND,
                     tag=tag,
                 )
             self.disp_dropdown[t] = True

tksheet/main_table.py

@@ -4913,7 +4913,7 @@ class MainTable(tk.Canvas):
         if isinstance(at_least_cols, int) and at_least_cols > total_data_cols:
             total_data_cols = at_least_cols
         total_data_cols = max(total_data_cols, len(self.col_positions) - 1)
-        if include_header and total_data_cols > len(self._headers):
+        if not isinstance(self._headers, int) and include_header and total_data_cols > len(self._headers):
             self.CH.fix_header(total_data_cols)
         for rn, r in enumerate(self.data):
             if total_data_cols > (lnr := len(r)):
@@ -5137,12 +5137,9 @@ class MainTable(tk.Canvas):
                     self.itemconfig(t, fill=fill, tag=tag, state="normal")
                 self.lift(t)
             else:
-                t = self.create_line(
+                t = self.create_polygon(
                     points,
                     fill=fill,
-                    width=2,
-                    capstyle=tk.ROUND,
-                    joinstyle=tk.ROUND,
                     tag=tag,
                 )
             self.disp_dropdown[t] = True

tksheet/row_index.py

@@ -117,6 +117,7 @@ class RowIndex(tk.Canvas):
         self.disp_resize_lines = {}
         self.disp_dropdown = {}
         self.disp_checkbox = {}
+        self.disp_tree_arrow = {}
         self.disp_boxes = set()
         self.hidd_text = {}
         self.hidd_high = {}
@@ -126,6 +127,7 @@ class RowIndex(tk.Canvas):
         self.hidd_resize_lines = {}
         self.hidd_dropdown = {}
         self.hidd_checkbox = {}
+        self.hidd_tree_arrow = {}
         self.hidd_boxes = set()
 
         self.align = kwargs["row_index_align"]
@@ -1017,7 +1019,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)
+            w += self.get_treeview_indent(self.MT._row_index[datarn].iid) + 4
         return w, h
 
     def set_row_height(
@@ -1205,7 +1207,7 @@ class RowIndex(tk.Canvas):
             if kwargs[0] is not None:
                 c_1 = kwargs[0] if kwargs[0].startswith("#") else color_map[kwargs[0]]
             if "rows" in selections and r in selections["rows"]:
-                tf = (
+                txtfg = (
                     self.PAR.ops.index_selected_rows_fg
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
@@ -1217,7 +1219,7 @@ class RowIndex(tk.Canvas):
                         + f"{int((int(c_1[5:], 16) + int(c_3[5:], 16)) / 2):02X}"
                     )
             elif "cells" in selections and r in selections["cells"]:
-                tf = (
+                txtfg = (
                     self.PAR.ops.index_selected_cells_fg
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
@@ -1229,7 +1231,7 @@ class RowIndex(tk.Canvas):
                         + f"{int((int(c_1[5:], 16) + int(c_2[5:], 16)) / 2):02X}"
                     )
             else:
-                tf = self.PAR.ops.index_fg if kwargs[1] is None else kwargs[1]
+                txtfg = self.PAR.ops.index_fg if kwargs[1] is None else kwargs[1]
                 if kwargs[0] is not None:
                     fill = kwargs[0]
             if kwargs[0] is not None:
@@ -1246,14 +1248,18 @@ class RowIndex(tk.Canvas):
                     ),
                     tag="s",
                 )
+            tree_arrow_fg = txtfg
         elif not kwargs:
             if "rows" in selections and r in selections["rows"]:
-                tf = self.PAR.ops.index_selected_rows_fg
+                txtfg = self.PAR.ops.index_selected_rows_fg
+                tree_arrow_fg = self.PAR.ops.selected_rows_tree_arrow_fg
             elif "cells" in selections and r in selections["cells"]:
-                tf = self.PAR.ops.index_selected_cells_fg
+                txtfg = self.PAR.ops.index_selected_cells_fg
+                tree_arrow_fg = self.PAR.ops.selected_cells_tree_arrow_fg
             else:
-                tf = self.PAR.ops.index_fg
-        return tf, redrawn
+                txtfg = self.PAR.ops.index_fg
+                tree_arrow_fg = self.PAR.ops.tree_arrow_fg
+        return txtfg, tree_arrow_fg, redrawn
 
     def redraw_highlight(self, x1, y1, x2, y2, fill, outline, tag):
         coords = (x1, y1, x2, y2)
@@ -1281,6 +1287,56 @@ class RowIndex(tk.Canvas):
         else:
             self.disp_grid[self.create_line(points, fill=fill, width=width, tag=tag)] = True
 
+    def redraw_tree_arrow(
+        self,
+        x1,
+        y1,
+        r,
+        fill,
+        tag,
+        indent: float,
+        open_: bool = False,
+    ) -> None:
+        mod = (self.MT.index_txt_height - 1) if self.MT.index_txt_height % 2 else self.MT.index_txt_height
+        half_mod = mod / 2
+        qtr_mod = mod / 4
+        mid_y = (self.MT.index_first_ln_ins - 1) if self.MT.index_first_ln_ins % 2 else self.MT.index_first_ln_ins
+        # up arrow
+        if open_:
+            points = (
+                x1 + 2 + indent,
+                y1 + mid_y + qtr_mod,
+                x1 + 2 + half_mod + indent,
+                y1 + mid_y - qtr_mod,
+                x1 + 2 + mod + indent,
+                y1 + mid_y + qtr_mod,
+            )
+        # right pointing arrow
+        else:
+            points = (
+                x1 + half_mod + indent,
+                y1 + mid_y - half_mod + 1,
+                x1 + mod + indent - 1,
+                y1 + mid_y,
+                x1 + half_mod + indent,
+                y1 + mid_y + half_mod - 1,
+            )
+        if self.hidd_tree_arrow:
+            t, sh = self.hidd_tree_arrow.popitem()
+            self.coords(t, points)
+            if sh:
+                self.itemconfig(t, fill=fill)
+            else:
+                self.itemconfig(t, fill=fill, tag=tag, state="normal")
+            self.lift(t)
+        else:
+            t = self.create_polygon(
+                points,
+                fill=fill,
+                tag=tag,
+            )
+        self.disp_tree_arrow[t] = True
+
     def redraw_dropdown(
         self,
         x1,
@@ -1293,7 +1349,6 @@ class RowIndex(tk.Canvas):
         draw_outline: bool = True,
         draw_arrow: bool = True,
         open_: bool = False,
-        indent: None | float = None,
     ) -> None:
         if draw_outline and self.PAR.ops.show_dropdown_borders:
             self.redraw_highlight(x1 + 1, y1 + 1, x2, y2, fill="", outline=self.PAR.ops.index_fg, tag=tag)
@@ -1302,47 +1357,24 @@ class RowIndex(tk.Canvas):
             half_mod = mod / 2
             qtr_mod = mod / 4
             mid_y = (self.MT.index_first_ln_ins - 1) if self.MT.index_first_ln_ins % 2 else self.MT.index_first_ln_ins
-            # treeview
-            if indent is not None:
-                # up arrow
-                if open_:
-                    points = (
-                        x1 + 2 + indent,
-                        y1 + mid_y + qtr_mod,
-                        x1 + 2 + half_mod + indent,
-                        y1 + mid_y - qtr_mod,
-                        x1 + 2 + mod + indent,
-                        y1 + mid_y + qtr_mod,
-                    )
-                # right pointing arrow
-                else:
-                    points = (
-                        x1 + half_mod + indent,
-                        y1 + mid_y - half_mod + 1,
-                        x1 + mod + indent - 1,
-                        y1 + mid_y,
-                        x1 + half_mod + indent,
-                        y1 + mid_y + half_mod - 1,
-                    )
+            if open_:
+                points = (
+                    x2 - 3 - mod,
+                    y1 + mid_y + qtr_mod,
+                    x2 - 3 - half_mod,
+                    y1 + mid_y - qtr_mod,
+                    x2 - 3,
+                    y1 + mid_y + qtr_mod,
+                )
             else:
-                if open_:
-                    points = (
-                        x2 - 3 - mod,
-                        y1 + mid_y + qtr_mod,
-                        x2 - 3 - half_mod,
-                        y1 + mid_y - qtr_mod,
-                        x2 - 3,
-                        y1 + mid_y + qtr_mod,
-                    )
-                else:
-                    points = (
-                        x2 - 3 - mod,
-                        y1 + mid_y - qtr_mod,
-                        x2 - 3 - half_mod,
-                        y1 + mid_y + qtr_mod,
-                        x2 - 3,
-                        y1 + mid_y - qtr_mod,
-                    )
+                points = (
+                    x2 - 3 - mod,
+                    y1 + mid_y - qtr_mod,
+                    x2 - 3 - half_mod,
+                    y1 + mid_y + qtr_mod,
+                    x2 - 3,
+                    y1 + mid_y - qtr_mod,
+                )
             if self.hidd_dropdown:
                 t, sh = self.hidd_dropdown.popitem()
                 self.coords(t, points)
@@ -1352,12 +1384,9 @@ class RowIndex(tk.Canvas):
                     self.itemconfig(t, fill=fill, tag=tag, state="normal")
                 self.lift(t)
             else:
-                t = self.create_line(
+                t = self.create_polygon(
                     points,
                     fill=fill,
-                    width=2,
-                    capstyle=tk.ROUND,
-                    joinstyle=tk.ROUND,
                     tag=tag,
                 )
             self.disp_dropdown[t] = True
@@ -1428,6 +1457,8 @@ class RowIndex(tk.Canvas):
         self.disp_dropdown = {}
         self.hidd_checkbox.update(self.disp_checkbox)
         self.disp_checkbox = {}
+        self.hidd_tree_arrow.update(self.disp_tree_arrow)
+        self.disp_tree_arrow = {}
         self.visible_row_dividers = {}
         draw_y = self.MT.row_positions[start_row]
         xend = self.current_width - 6
@@ -1484,7 +1515,15 @@ class RowIndex(tk.Canvas):
             if rbotgridln - rtopgridln < self.MT.index_txt_height:
                 continue
             datarn = r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
-            fill, dd_drawn = self.redraw_highlight_get_text_fg(rtopgridln, rbotgridln, r, c_2, c_3, selections, datarn)
+            fill, tree_arrow_fg, dd_drawn = self.redraw_highlight_get_text_fg(
+                rtopgridln,
+                rbotgridln,
+                r,
+                c_2,
+                c_3,
+                selections,
+                datarn,
+            )
 
             if datarn in self.cell_options and "align" in self.cell_options[datarn]:
                 align = self.cell_options[datarn]["align"]
@@ -1584,20 +1623,16 @@ class RowIndex(tk.Canvas):
                 if align == "w":
                     draw_x += self.MT.index_txt_height + 1
                 indent = self.get_treeview_indent(iid)
-                draw_x += indent
+                draw_x += indent + 4
                 if self.tree[iid].children:
-                    self.redraw_dropdown(
+                    self.redraw_tree_arrow(
                         0,
                         rtopgridln,
-                        self.current_width - 1,
-                        rbotgridln - 1,
-                        fill=fill,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=False,
-                        draw_arrow=True,
-                        open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
+                        r=r,
+                        fill=tree_arrow_fg,
+                        tag="ta",
                         indent=indent,
+                        open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
                     )
             lns = self.get_valid_cell_data_as_str(datarn, fix=False)
             if not lns:
@@ -1677,7 +1712,14 @@ class RowIndex(tk.Canvas):
                         draw_y += self.MT.index_xtra_lines_increment
                         if draw_y + self.MT.index_half_txt_height - 1 > rbotgridln:
                             break
-        for dct in (self.hidd_text, self.hidd_high, self.hidd_grid, self.hidd_dropdown, self.hidd_checkbox):
+        for dct in (
+            self.hidd_text,
+            self.hidd_high,
+            self.hidd_grid,
+            self.hidd_dropdown,
+            self.hidd_checkbox,
+            self.hidd_tree_arrow,
+        ):
             for iid, showing in dct.items():
                 if showing:
                     self.itemconfig(iid, state="hidden")

tksheet/sheet_options.py

@@ -149,6 +149,9 @@ def new_sheet_options() -> DotDict:
             "table_bg": theme_light_blue["table_bg"],
             "table_grid_fg": theme_light_blue["table_grid_fg"],
             "table_fg": theme_light_blue["table_fg"],
+            "tree_arrow_fg": theme_light_blue["tree_arrow_fg"],
+            "selected_cells_tree_arrow_fg": theme_light_blue["selected_cells_tree_arrow_fg"],
+            "selected_rows_tree_arrow_fg": theme_light_blue["selected_rows_tree_arrow_fg"],
             "table_selected_box_cells_fg": theme_light_blue["table_selected_box_cells_fg"],
             "table_selected_box_rows_fg": theme_light_blue["table_selected_box_rows_fg"],
             "table_selected_box_columns_fg": theme_light_blue["table_selected_box_columns_fg"],

tksheet/themes.py

@@ -46,6 +46,9 @@ theme_light_blue: dict[str, str] = DotDict({
     "table_selected_columns_border_fg": "#0B57D0",
     "table_selected_columns_bg": "#E6EFFD",
     "table_selected_columns_fg": "black",
+    "tree_arrow_fg": "#C4C7C5",
+    "selected_cells_tree_arrow_fg": "#D3E3FD",
+    "selected_rows_tree_arrow_fg": "#FFFFFF",
     "vertical_scroll_background": "#FFFFFF",
     "horizontal_scroll_background": "#FFFFFF",
     "vertical_scroll_troughcolor": "#f9fbfd",
@@ -118,6 +121,9 @@ theme_light_green: dict[str, str] = DotDict({
     "table_selected_columns_border_fg": "#217346",
     "table_selected_columns_bg": "#E3E3E3",
     "table_selected_columns_fg": "black",
+    "tree_arrow_fg": "#ababab",
+    "selected_cells_tree_arrow_fg": "#217346",
+    "selected_rows_tree_arrow_fg": "#217346",
     "vertical_scroll_background": "#FFFFFF",
     "horizontal_scroll_background": "#FFFFFF",
     "vertical_scroll_troughcolor": "#f1f1f1",
@@ -190,6 +196,9 @@ theme_dark: dict[str, str] = DotDict({
     "table_selected_columns_border_fg": "#4489F7",
     "table_selected_columns_bg": "#404040",
     "table_selected_columns_fg": "#F7F7F7",
+    "tree_arrow_fg": "#8C8C8C",
+    "selected_cells_tree_arrow_fg": "#6aa2fc",
+    "selected_rows_tree_arrow_fg": "white",
     "vertical_scroll_background": "#3b3b3d",
     "horizontal_scroll_background": "#3b3b3d",
     "vertical_scroll_troughcolor": "#000000",
@@ -262,6 +271,9 @@ theme_black: dict[str, str] = DotDict({
     "table_selected_columns_border_fg": "#FBB86C",
     "table_selected_columns_bg": "#404040",
     "table_selected_columns_fg": "#F7F7F7",
+    "tree_arrow_fg": "#8C8C8C",
+    "selected_cells_tree_arrow_fg": "#8C8C8C",
+    "selected_rows_tree_arrow_fg": "#8C8C8C",
     "vertical_scroll_background": "#3b3a39",
     "horizontal_scroll_background": "#3b3a39",
     "vertical_scroll_troughcolor": "#000000",

{tksheet-7.1.20.dist-info → tksheet-7.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.1.20
+Version: 7.1.21
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

tksheet-7.1.21.dist-info/RECORD

@@ -0,0 +1,20 @@
+tksheet/__init__.py,sha256=weNGFG5IXM4WSPAU17cMCzgKkKc86x_HjNjEa7t4TYc,2044
+tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
+tksheet/column_headers.py,sha256=9AlPQ9xLcheivOjOlH1be35ddlzKSpcB0xRru4rAADw,100677
+tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
+tksheet/functions.py,sha256=Vm_tCPCaos8C_or_70OGpSrXKmFnE8OxODchfrUJBMM,40281
+tksheet/main_table.py,sha256=o70LTXPh-WBGdgOCNn2cjZVYm_73xG2RpVaJUGjmTXw,320166
+tksheet/other_classes.py,sha256=P3FYUYreLhstATvHCNow8sDQoCsD_02KB6oXcca3ahE,13628
+tksheet/row_index.py,sha256=G-g7iZQ4fn8oLHmTnW_HjrB-xVxqyxPcnh7ks77AYvs,107050
+tksheet/sheet.py,sha256=TLWV_C-C3XiweHbPdskCnT9v6Zr6Dxym2Ijv-CULgWs,260302
+tksheet/sheet_options.py,sha256=5xYIQkixisCjt0kid38jpOt7yo8-zokBPahc9YgWbuA,12231
+tksheet/text_editor.py,sha256=81_IZKrTVa2KIx2cJ4n3cFvFMAwvbHIQYgqtyat-97I,6681
+tksheet/themes.py,sha256=aGbxbnOdsx0uZrsQlHfS6KlmEfk07Z3MqTv2WzH2oH8,14000
+tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
+tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
+tksheet/vars.py,sha256=Nb0mhxJt-SXipi3cE9J9Ea1H1iPqC8PRvUR9CqqMlVA,3062
+tksheet-7.1.21.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.1.21.dist-info/METADATA,sha256=G5dscWBXHwXVBoiQYnPEYXZ--Ys6-ihXjlULxwbV4co,6032
+tksheet-7.1.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.1.21.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.1.21.dist-info/RECORD,,

tksheet-7.1.20.dist-info/RECORD

@@ -1,20 +0,0 @@
-tksheet/__init__.py,sha256=n15iE0L6zsiYW5IhLE5m3yb867QM9gl2SBrdQk_bjLc,2044
-tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=Kzu_nIMt3oFZO6F00iHBmjv5L0STsVN7Gc34wzwKDJ4,100785
-tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
-tksheet/functions.py,sha256=Vm_tCPCaos8C_or_70OGpSrXKmFnE8OxODchfrUJBMM,40281
-tksheet/main_table.py,sha256=DrRC3WLGiS6JkAS4Ir-8c1n_4C4l4Coe6jb45Uceekc,320235
-tksheet/other_classes.py,sha256=P3FYUYreLhstATvHCNow8sDQoCsD_02KB6oXcca3ahE,13628
-tksheet/row_index.py,sha256=57cWphhUGsghh9UiHtAHi0m9S403-9MrYiMtTzK7h8E,106014
-tksheet/sheet.py,sha256=TLWV_C-C3XiweHbPdskCnT9v6Zr6Dxym2Ijv-CULgWs,260302
-tksheet/sheet_options.py,sha256=mh0rTvWrFvIKaiv88jtMZy0TSA8zTS1GXSe88u8_rzk,11978
-tksheet/text_editor.py,sha256=81_IZKrTVa2KIx2cJ4n3cFvFMAwvbHIQYgqtyat-97I,6681
-tksheet/themes.py,sha256=0XY97zB9e26edyxMWutofNarNon8Pp5lpprHYeL_4b0,13490
-tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
-tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
-tksheet/vars.py,sha256=Nb0mhxJt-SXipi3cE9J9Ea1H1iPqC8PRvUR9CqqMlVA,3062
-tksheet-7.1.20.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.1.20.dist-info/METADATA,sha256=C_WIADFKe41LVlFXKzK7QFO6vQIi0ym2Uk40WiNx9zM,6032
-tksheet-7.1.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.1.20.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.1.20.dist-info/RECORD,,