tksheet 7.1.22__py3-none-any.whl → 7.1.23__py3-none-any.whl

tksheet/__init__.py

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

tksheet/main_table.py

@@ -5281,7 +5281,7 @@ class MainTable(tk.Canvas):
                     for i, w in enumerate(widths):
                         if i not in diffs:
                             widths[i] -= change
-                self.set_col_positions(itr=widths)
+                self.col_positions = list(accumulate(chain([0], widths)))
         if self.PAR.ops.auto_resize_rows and self.allow_auto_resize_rows and row_pos_exists:
             max_h = can_height - self.PAR.ops.empty_vertical
             if self.PAR.ops.auto_resize_rows < self.min_row_height:
@@ -5306,17 +5306,18 @@ class MainTable(tk.Canvas):
                         if i not in diffs:
                             heights[i] -= change
                 self.row_positions = list(accumulate(chain([0], heights)))
-        if can_width >= self.col_positions[-1] + self.PAR.ops.empty_horizontal and self.PAR.xscroll_showing:
-            self.PAR.xscroll.grid_forget()
-            self.PAR.xscroll_showing = False
-        elif (
-            can_width < self.col_positions[-1] + self.PAR.ops.empty_horizontal
-            and not self.PAR.xscroll_showing
-            and not self.PAR.xscroll_disabled
-            and can_height > 40
-        ):
-            self.PAR.xscroll.grid(row=2, column=0, columnspan=2, sticky="nswe")
-            self.PAR.xscroll_showing = True
+        if self.PAR.ops.auto_resize_row_index is not True:
+            if can_width >= self.col_positions[-1] + self.PAR.ops.empty_horizontal and self.PAR.xscroll_showing:
+                self.PAR.xscroll.grid_forget()
+                self.PAR.xscroll_showing = False
+            elif (
+                can_width < self.col_positions[-1] + self.PAR.ops.empty_horizontal
+                and not self.PAR.xscroll_showing
+                and not self.PAR.xscroll_disabled
+                and can_height > 40
+            ):
+                self.PAR.xscroll.grid(row=2, column=0, columnspan=2, sticky="nswe")
+                self.PAR.xscroll_showing = True
         if can_height >= self.row_positions[-1] + self.PAR.ops.empty_vertical and self.PAR.yscroll_showing:
             self.PAR.yscroll.grid_forget()
             self.PAR.yscroll_showing = False
@@ -5354,7 +5355,7 @@ class MainTable(tk.Canvas):
         start_col = bisect_left(self.col_positions, scrollpos_left)
         end_col = bisect_right(self.col_positions, scrollpos_right)
         changed_w = False
-        if redraw_row_index and self.show_index:
+        if self.PAR.ops.auto_resize_row_index and redraw_row_index and self.show_index:
             changed_w = self.RI.auto_set_index_width(
                 end_row=end_row - 1,
                 only_rows=[self.datarn(r) for r in range(start_row if not start_row else start_row - 1, end_row - 1)],

tksheet/row_index.py

@@ -1192,23 +1192,22 @@ class RowIndex(tk.Canvas):
             self.MT.recreate_all_selection_boxes()
 
     def auto_set_index_width(self, end_row: int, only_rows: list) -> bool:
-        if self.PAR.ops.auto_resize_row_index:
-            if not isinstance(self.MT._row_index, int) and not self.MT._row_index:
-                if self.default_index == "letters":
-                    new_w = self.MT.get_txt_w(f"{num2alpha(end_row)}") + 20
-                elif self.default_index == "numbers":
-                    new_w = self.MT.get_txt_w(f"{end_row}") + 20
-                elif self.default_index == "both":
-                    new_w = self.MT.get_txt_w(f"{end_row + 1} {num2alpha(end_row)}") + 20
-            elif self.PAR.ops.auto_resize_row_index is True:
-                new_w = self.set_width_of_index_to_text(only_rows=only_rows, set_width=False)
-            else:
-                new_w = None
-            if new_w is not None and (sheet_w_x := floor(self.PAR.winfo_width() * 0.7)) < new_w:
-                new_w = sheet_w_x
-            if new_w and (self.current_width - new_w > 15 or new_w - self.current_width > 3):
-                self.set_width(new_w, set_TL=True)
-                return True
+        if not isinstance(self.MT._row_index, int) and not self.MT._row_index:
+            if self.default_index == "letters":
+                new_w = self.MT.get_txt_w(f"{num2alpha(end_row)}") + 20
+            elif self.default_index == "numbers":
+                new_w = self.MT.get_txt_w(f"{end_row}") + 20
+            elif self.default_index == "both":
+                new_w = self.MT.get_txt_w(f"{end_row + 1} {num2alpha(end_row)}") + 20
+        elif self.PAR.ops.auto_resize_row_index is True:
+            new_w = self.set_width_of_index_to_text(only_rows=only_rows, set_width=False)
+        else:
+            new_w = None
+        if new_w is not None and (sheet_w_x := floor(self.PAR.winfo_width() * 0.7)) < new_w:
+            new_w = sheet_w_x
+        if new_w and (self.current_width - new_w > 15 or new_w - self.current_width > 3):
+            self.set_width(new_w, set_TL=True)
+            return True
         return False
 
     def redraw_highlight_get_text_fg(self, fr, sr, r, c_2, c_3, selections, datarn):

tksheet/sheet.py

@@ -4561,7 +4561,7 @@ class Sheet(tk.Frame):
             self.tree_set_open(open_ids=open_ids)
         else:
             self.hide_rows(
-                set(self.RI.tree_rns[iid] for iid in self.get_children() if self.RI.tree[iid].parent),
+                {self.RI.tree_rns[iid] for iid in self.get_children() if self.RI.tree[iid].parent},
                 deselect_all=False,
                 data_indexes=True,
                 row_heights=False if row_heights is False else True,
@@ -4585,46 +4585,76 @@ class Sheet(tk.Frame):
         Closes everything else
         """
         self.hide_rows(
-            # set(self.MT.displayed_rows),
             set(rn for rn in self.MT.displayed_rows if self.MT._row_index[rn].parent),
             redraw=False,
             deselect_all=False,
             data_indexes=True,
         )
-        # self.show_rows(
-        #     (self.RI.tree_rns[iid] for iid in self.get_children("")),
-        #     redraw=False,
-        #     deselect_all=True,
-        # )
         open_ids = set(filter(self.exists, map(str.lower, open_ids)))
         self.RI.tree_open_ids = set()
         if open_ids:
-            self.tree_open(open_ids)
-        return self
+            to_open = self._tree_open(open_ids)
+            self.show_rows(
+                rows=to_open,
+                redraw=False,
+                deselect_all=False,
+            )
+        return self.set_refresh_timer(True)
+    
+    def _tree_open(self, items: set[str]) -> list[int]:
+        """
+        Only meant for internal use
+        """
+        to_open = []
+        for item in filter(items.__contains__, self.get_children()):
+            if self.RI.tree[item].children:
+                self.RI.tree_open_ids.add(item)
+                to_open.extend(self.RI.tree_rns[did] for did in self.RI.get_iid_descendants(item, check_open=True))
+        return to_open
 
-    def tree_open(self, *items) -> Sheet:
+    def tree_open(self, *items, redraw: bool = True) -> Sheet:
         """
         If used without args all items are opened
         """
         if items := set(unpack(items)):
-            for item in filter(items.__contains__, self.get_children()):
-                self.item(item, open_=True)
+            to_open = self._tree_open(items)
         else:
+            to_open = []
             for item in self.get_children():
-                self.item(item, open_=True)
-        return self
+                if self.RI.tree[item].children:
+                    self.RI.tree_open_ids.add(item)
+                    to_open.extend(self.RI.tree_rns[did] for did in self.RI.get_iid_descendants(item, check_open=True))
+        return self.show_rows(
+            rows=to_open,
+            redraw=redraw,
+            deselect_all=False,
+        )
 
-    def tree_close(self, *items) -> Sheet:
+    def tree_close(self, *items, redraw: bool = True) -> Sheet:
         """
         If used without args all items are closed
         """
+        to_close = set()
         if items:
             for item in unpack(items):
-                self.item(item, open_=False)
+                if self.RI.tree[item].children:
+                    self.RI.tree_open_ids.discard(item)
+                    if self.RI.tree_rns[item] in self.MT.displayed_rows:
+                        for did in self.RI.get_iid_descendants(item, check_open=True):
+                            to_close.add(self.RI.tree_rns[did])
         else:
             for item in self.get_children():
-                self.item(item, open_=False)
-        return self
+                if self.RI.tree[item].children:
+                    self.RI.tree_open_ids.discard(item)
+                    if self.RI.tree_rns[item] in self.MT.displayed_rows:
+                        for did in self.RI.get_iid_descendants(item, check_open=True):
+                            to_close.add(self.RI.tree_rns[did])
+        return self.hide_rows(
+            rows=to_close,
+            redraw=redraw,
+            deselect_all=False,
+            data_indexes=True,
+        )
 
     def insert(
         self,

{tksheet-7.1.22.dist-info → tksheet-7.1.23.dist-info}/METADATA

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

{tksheet-7.1.22.dist-info → tksheet-7.1.23.dist-info}/RECORD

@@ -1,20 +1,20 @@
-tksheet/__init__.py,sha256=WycEvqmjym6j4M6uhjfRP1epMXGkfU87U08AeMbavAI,2125
+tksheet/__init__.py,sha256=-p2HkPQzNlT61u0_M_sJ-7FLOi8TfAc00slnmCD9Itc,2125
 tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
 tksheet/column_headers.py,sha256=cWTHyYaA5nNMfT6WyFJB0lyeNQFRVXZPbX9C-lLH4Yg,100770
 tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
 tksheet/functions.py,sha256=rNfDpQRoXZm_Ro-tlF92ox3fi37p71Mio1PGTreM_oc,40835
-tksheet/main_table.py,sha256=Z9ih53-4t2OoPyIbXczSSPiIt3oCBzR7UQJF9l3dfFg,322148
+tksheet/main_table.py,sha256=Bvzt8SdLL0gEak3fdYBzMJH184SvmmrB-8UIWaFfc-U,322314
 tksheet/other_classes.py,sha256=P3FYUYreLhstATvHCNow8sDQoCsD_02KB6oXcca3ahE,13628
-tksheet/row_index.py,sha256=6J72VDTufsoPCxhmH4C-ARPcy0Qq5QaXq4erQXPLosE,107058
-tksheet/sheet.py,sha256=07BGVsrBYV1xviJ7quKnmZA-QwLVJV6CcbAYz23Llp4,264445
+tksheet/row_index.py,sha256=ZAhdV3QthyJuvEEaGE7AmvOzWcMrtCaX4e5mYIm0il8,106946
+tksheet/sheet.py,sha256=82EumnVqs7VUdLrp6CY_o6L7t4-CwqOm_yDZT6LGL7I,265879
 tksheet/sheet_options.py,sha256=rf1xtaZdGnJYSgR_sFsYlGSEj3bYHpSm15CH2aZETUo,12231
 tksheet/text_editor.py,sha256=DGFgukHZ5gruA_hWN1cuhv88z0nR5316xGynx3OioWQ,6548
 tksheet/themes.py,sha256=IeOgexzqgEM11i8Ie3awIL7nH9DVm65eW4XCcrRK9HE,14480
 tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
 tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
 tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
-tksheet-7.1.22.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.1.22.dist-info/METADATA,sha256=fPSQKrzQyNTD_TImpXq5a2Baaj0VOpchtk9nUGavYGw,6146
-tksheet-7.1.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.1.22.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.1.22.dist-info/RECORD,,
+tksheet-7.1.23.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.1.23.dist-info/METADATA,sha256=Q-0dTLu2rhobiuJ305tNs6Gu0LWXAqhv9Jue3i5Dk5U,6146
+tksheet-7.1.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.1.23.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.1.23.dist-info/RECORD,,