tksheet 7.1.6__py3-none-any.whl → 7.1.7__py3-none-any.whl

tksheet/row_index.py

@@ -31,7 +31,7 @@ from .functions import (
     consecutive_chunks,
     ev_stack_dict,
     event_dict,
-    get_checkbox_points,
+    rounded_box_coords,
     get_n2a,
     is_contiguous,
     num2alpha,
@@ -405,7 +405,7 @@ class RowIndex(tk.Canvas):
                 ):
                     self.open_cell(event)
                 elif (iid := self.event_over_tree_arrow(r, self.canvasy(event.y), event.x)) is not None:
-                    self.PAR.item(iid, open_=iid not in self.tree_open_ids)
+                    self.PAR.item(iid, open_=iid not in self.tree_open_ids, redraw=False)
         self.rsz_h = None
         self.mouse_motion(event)
         try_binding(self.extra_double_b1_func, event)
@@ -869,7 +869,7 @@ class RowIndex(tk.Canvas):
                 elif (iid := self.event_over_tree_arrow(r, canvasy, event.x)) is not None:
                     if self.MT.selection_boxes:
                         self.select_row(r, redraw=False)
-                    self.PAR.item(iid, open_=iid not in self.tree_open_ids)
+                    self.PAR.item(iid, open_=iid not in self.tree_open_ids, redraw=False)
             else:
                 self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
             self.b1_pressed_loc = None
@@ -958,14 +958,33 @@ class RowIndex(tk.Canvas):
         outline: str,
         state: str,
         tags: str | tuple[str],
+        iid: None | int = None,
     ) -> int:
-        if self.hidd_boxes:
-            iid = self.hidd_boxes.pop()
-            self.coords(iid, x1, y1, x2, y2)
+        coords = rounded_box_coords(
+            x1,
+            y1,
+            x2,
+            y2,
+            radius=9 if self.PAR.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:
-            iid = self.create_rectangle(x1, y1, x2, y2, fill=fill, outline=outline, state=state, tags=tags)
-        self.disp_boxes.add(iid)
+            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) -> None:
@@ -1341,7 +1360,7 @@ class RowIndex(tk.Canvas):
             self.disp_dropdown[t] = True
 
     def redraw_checkbox(self, x1, y1, x2, y2, fill, outline, tag, draw_check=False):
-        points = get_checkbox_points(x1, y1, x2, y2)
+        points = rounded_box_coords(x1, y1, x2, y2)
         if self.hidd_checkbox:
             t, sh = self.hidd_checkbox.popitem()
             self.coords(t, points)
@@ -1359,7 +1378,7 @@ class RowIndex(tk.Canvas):
             y1 = y1 + 4
             x2 = x2 - 3
             y2 = y2 - 3
-            points = get_checkbox_points(x1, y1, x2, y2, radius=4)
+            points = rounded_box_coords(x1, y1, x2, y2, radius=4)
             if self.hidd_checkbox:
                 t, sh = self.hidd_checkbox.popitem()
                 self.coords(t, points)
@@ -1659,16 +1678,14 @@ class RowIndex(tk.Canvas):
                     dct[iid] = False
         return True
 
-    def get_redraw_selections(self, startr, endr):
-        d = defaultdict(list)
+    def get_redraw_selections(self, startr: int, endr: int) -> dict[str, set[int]]:
+        d = defaultdict(set)
         for item, box in self.MT.get_selection_items(columns=False):
-            d[box.type_].append(box.coords)
-        d2 = {}
-        if "cells" in d:
-            d2["cells"] = {r for r in range(startr, endr) for r1, c1, r2, c2 in d["cells"] if r1 <= r and r2 > r}
-        if "rows" in d:
-            d2["rows"] = {r for r in range(startr, endr) for r1, c1, r2, c2 in d["rows"] if r1 <= r and r2 > r}
-        return d2
+            r1, c1, r2, c2 = box.coords
+            for r in range(startr, endr):
+                if r1 <= r and r2 > r:
+                    d[box.type_].add(r)
+        return d
 
     def open_cell(self, event: object = None, ignore_existing_editor=False):
         if not self.MT.anything_selected() or (not ignore_existing_editor and self.text_editor.open):
@@ -1892,6 +1909,8 @@ class RowIndex(tk.Canvas):
 
     def hide_text_editor(self, reason: None | str = None) -> None:
         if self.text_editor.open:
+            for b in ("<Alt-Return>", "<Option-Return>", "<Tab>", "<Return>", "<FocusOut>", "<Escape>"):
+                self.text_editor.tktext.unbind(b)
             self.itemconfig(self.text_editor.canvas_id, state="hidden")
             self.text_editor.open = False
         if reason == "Escape":
@@ -1913,7 +1932,7 @@ class RowIndex(tk.Canvas):
         if editor_info is not None and len(editor_info) >= 2 and editor_info[1] == "Escape":
             self.hide_text_editor_and_dropdown()
             return
-        self.text_editor_value = self.text_editor.get()
+        text_editor_value = self.text_editor.get()
         r = editor_info[0]
         datarn = r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
         event_data = event_dict(
@@ -1921,7 +1940,7 @@ class RowIndex(tk.Canvas):
             sheet=self.PAR.name,
             cells_index={datarn: self.get_cell_data(datarn)},
             key=editor_info[1] if len(editor_info) >= 2 else "FocusOut",
-            value=self.text_editor_value,
+            value=text_editor_value,
             loc=r,
             boxes=self.MT.get_boxes(),
             selected=self.MT.selected,
@@ -1934,11 +1953,11 @@ class RowIndex(tk.Canvas):
             check_input_valid=False,
         )
         if self.MT.edit_validation_func:
-            self.text_editor_value = self.MT.edit_validation_func(event_data)
-            if self.text_editor_value is not None and self.input_valid_for_cell(datarn, self.text_editor_value):
-                edited = set_data(value=self.text_editor_value)
-        elif self.input_valid_for_cell(datarn, self.text_editor_value):
-            edited = set_data(value=self.text_editor_value)
+            text_editor_value = self.MT.edit_validation_func(event_data)
+            if text_editor_value is not None and self.input_valid_for_cell(datarn, text_editor_value):
+                edited = set_data(value=text_editor_value)
+        elif self.input_valid_for_cell(datarn, text_editor_value):
+            edited = set_data(value=text_editor_value)
         if edited:
             try_binding(self.extra_end_edit_cell_func, event_data)
         self.MT.recreate_all_selection_boxes()
@@ -2125,6 +2144,7 @@ class RowIndex(tk.Canvas):
 
     def hide_dropdown_window(self) -> None:
         if self.dropdown.open:
+            self.dropdown.window.unbind("<FocusOut>")
             self.itemconfig(self.dropdown.canvas_id, state="hidden")
             self.dropdown.open = False
 

tksheet/sheet.py

@@ -171,6 +171,9 @@ class Sheet(tk.Frame):
         display_selected_fg_over_highlights: bool = False,
         show_selected_cells_border: bool = True,
         treeview: bool = False,
+        treeview_indent: str | int = "3",
+        rounded_boxes: bool = True,
+        alternate_color: str = "",
         # colors
         outline_thickness: int = 0,
         outline_color: str = theme_light_blue["outline_color"],
@@ -3795,8 +3798,6 @@ class Sheet(tk.Frame):
         )
         if deselect_all:
             self.MT.deselect(redraw=False)
-        else:
-            self.MT.deselect_any(rows=rows, redraw=False)
         self.set_refresh_timer(redraw)
         return self
 
@@ -4558,6 +4559,7 @@ class Sheet(tk.Frame):
         text: str | None = None,
         values: list | None = None,
         open_: bool | None = None,
+        redraw: bool = True,
     ) -> DotDict | Sheet:
         """
         Modify options for item
@@ -4600,7 +4602,7 @@ class Sheet(tk.Frame):
             else:
                 self.RI.tree_open_ids.discard(item)
         get = not (isinstance(iid, str) or isinstance(text, str) or isinstance(values, list) or isinstance(open_, bool))
-        self.set_refresh_timer(redraw=not get)
+        self.set_refresh_timer(redraw=not get or redraw)
         if get:
             return DotDict(
                 text=self.RI.tree[item].text,
@@ -4616,10 +4618,11 @@ class Sheet(tk.Frame):
             raise ValueError(f"item '{item.lower()}' does not exist.")
 
     def rowitem(self, row: int, data_index: bool = False) -> str | None:
-        if not data_index:
-            row = self.data_r(row)
-        if isinstance(row, int) and len(self.MT._row_index) > row:
-            return self.MT._row_index[row].iid
+        if isinstance(row, int):
+            if not data_index:
+                row = self.data_r(row)
+            if len(self.MT._row_index) > row:
+                return self.MT._row_index[row].iid
         return None
 
     def get_children(self, item: None | str = None) -> Generator[str]:
@@ -4660,67 +4663,23 @@ class Sheet(tk.Frame):
         self.set_refresh_timer(True)
         return self
 
-    def set_children(self, item: str, *newchildren) -> Sheet:
+    def set_children(self, parent: str, *newchildren) -> Sheet:
         """
-        Moves everything in '*newchildren' under 'item'
+        Moves everything in '*newchildren' under 'parent'
         """
-        if (item := item.lower()) and item not in self.RI.tree:
-            raise ValueError(f"Item '{item}' does not exist.")
-        mapping = {}
-        to_show = []
-        if item:
-            new_parent = self.RI.tree[item]
-            if new_parent.children:
-                ctr = self.RI.tree_rns[new_parent.children[-1].iid] + 1
-            else:
-                ctr = self.RI.tree_rns[new_parent.iid] + 1
-            for cid in unpack(newchildren):
-                if self.RI.pid_causes_recursive_loop(cid, item):
-                    raise ValueError(f"iid '{cid}' causes a recursive loop with parent '{item}'.")
-                cid_node = self.RI.tree[cid]
-                mapping[self.RI.tree_rns[cid]] = ctr
-                if item in self.RI.tree_open_ids and self.item_displayed(item):
-                    to_show.append(ctr)
-                ctr += 1
-                for did in self.RI.get_iid_descendants(cid):
-                    mapping[self.RI.tree_rns[did]] = ctr
-                    if to_show and self.RI.ancestors_all_open(did, self.RI.tree[cid].parent):
-                        to_show.append(ctr)
-                    ctr += 1
-                self.RI.remove_node_from_parents_children(cid_node)
-                cid_node.parent = new_parent
-                new_parent.children.append(cid_node)
-        else:
-            ctr = (
-                len(self.MT._row_index)
-                - len(newchildren)
-                - sum(1 for cid in unpack(newchildren) for _ in self.RI.get_iid_descendants(cid))
-            )
-            for cid in unpack(newchildren):
-                cid_node = self.RI.tree[cid]
-                mapping[self.RI.tree_rns[cid]] = ctr
-                to_show.append(ctr)
-                ctr += 1
-                for did in self.RI.get_iid_descendants(cid):
-                    mapping[self.RI.tree_rns[did]] = ctr
-                    if self.RI.ancestors_all_open(did, cid_node.parent):
-                        to_show.append(ctr)
-                    ctr += 1
-                self.RI.remove_node_from_parents_children(cid_node)
-                self.RI.tree[cid].parent = ""
-        self.mapping_move_rows(
-            data_new_idxs=mapping,
-            data_indexes=True,
-            create_selections=False,
-            redraw=False,
-        )
-        if item and (item not in self.RI.tree_open_ids or not self.item_displayed(item)):
-            self.hide_rows(set(mapping.values()), data_indexes=True)
-        self.show_rows(to_show)
-        self.set_refresh_timer(True)
+        for iid in unpack(newchildren):
+            self.move(iid, parent)
         return self
 
-    def move(self, item: str, parent: str, index: int = 0) -> Sheet:
+    def find_rn_at_top_index(self, index: int) -> int:
+        wo_par = 0
+        for rn, n in enumerate(self.MT._row_index):
+            if not n.parent:
+                if wo_par == index:
+                    return rn
+                wo_par += 1
+
+    def move(self, item: str, parent: str, index: int | None = None) -> Sheet:
         """
         Moves item to be under parent as child at index
         'parent' can be empty string which will make item a top node
@@ -4737,35 +4696,49 @@ class Sheet(tk.Frame):
                 raise ValueError(f"iid '{item}' causes a recursive loop with parent '{parent}'.")
             parent_node = self.RI.tree[parent]
             if parent_node.children:
-                if len(parent_node.children) < index:
-                    index = len(parent_node.children)
-                ctr = self.RI.tree_rns[parent_node.children[index].iid]
+                if index is None or index >= len(parent_node.children):
+                    index = len(parent_node.children) - 1
+                item_r = self.RI.tree_rns[item]
+                new_r = self.RI.tree_rns[parent_node.children[index].iid]
+                if item_node not in parent_node.children:
+                    new_r += 1
+                new_r_desc = sum(1 for _ in self.RI.get_iid_descendants(parent_node.children[index].iid))
+                item_desc = sum(1 for _ in self.RI.get_iid_descendants(item))
+                if item_r < new_r:
+                    r_ctr = new_r + new_r_desc - item_desc
+                else:
+                    r_ctr = new_r
             else:
-                ctr = self.RI.tree_rns[parent_node.iid] + 1
-            mapping[self.RI.tree_rns[item]] = ctr
+                r_ctr = self.RI.tree_rns[parent_node.iid] + 1
+            mapping[item_r] = r_ctr
             if parent in self.RI.tree_open_ids and self.item_displayed(parent):
-                to_show.append(ctr)
-            ctr += 1
+                to_show.append(r_ctr)
+            r_ctr += 1
             for did in self.RI.get_iid_descendants(item):
-                mapping[self.RI.tree_rns[did]] = ctr
+                mapping[self.RI.tree_rns[did]] = r_ctr
                 if to_show and self.RI.ancestors_all_open(did, item_node.parent):
-                    to_show.append(ctr)
-                ctr += 1
+                    to_show.append(r_ctr)
+                r_ctr += 1
             self.RI.remove_node_from_parents_children(item_node)
             item_node.parent = parent_node
             parent_node.children.append(item_node)
         else:
-            if len(self.MT._row_index) < index:
-                index = len(self.MT._row_index)
-            ctr = index
-            mapping[self.RI.tree_rns[item]] = ctr
-            to_show.append(ctr)
-            ctr += 1
+            new_r = self.find_rn_at_top_index((sum(1 for _ in self.get_children("")) - 1) if index is None else index)
+            item_r = self.RI.tree_rns[item]
+            if item_r < new_r:
+                par_desc = sum(1 for _ in self.RI.get_iid_descendants(self.rowitem(new_r, data_index=True)))
+                item_desc = sum(1 for _ in self.RI.get_iid_descendants(item))
+                r_ctr = new_r + par_desc - item_desc
+            else:
+                r_ctr = new_r
+            mapping[item_r] = r_ctr
+            to_show.append(r_ctr)
+            r_ctr += 1
             for did in self.RI.get_iid_descendants(item):
-                mapping[self.RI.tree_rns[did]] = ctr
+                mapping[self.RI.tree_rns[did]] = r_ctr
                 if to_show and self.RI.ancestors_all_open(did, item_node.parent):
-                    to_show.append(ctr)
-                ctr += 1
+                    to_show.append(r_ctr)
+                r_ctr += 1
             self.RI.remove_node_from_parents_children(item_node)
             self.RI.tree[item].parent = ""
         self.mapping_move_rows(

tksheet/sheet_options.py

@@ -234,6 +234,8 @@ def new_sheet_options() -> DotDict:
             "display_selected_fg_over_highlights": False,
             "show_selected_cells_border": True,
             "treeview": False,
-            "treeview_indent": "2",
+            "treeview_indent": "3",
+            "rounded_boxes": True,
+            "alternate_color": "",
         }
     )

{tksheet-7.1.6.dist-info → tksheet-7.1.7.dist-info}/METADATA

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

tksheet-7.1.7.dist-info/RECORD

@@ -0,0 +1,21 @@
+tksheet/__init__.py,sha256=UgweIADXnlw1-KpD4Xr0sA_l6qAWTP3yzQ1Bo716Fkg,2010
+tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
+tksheet/column_headers.py,sha256=dBEnPjbI6nqcS0OISWJ0tXBBxtGjB67OE8z2-Bx8X1U,99870
+tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
+tksheet/functions.py,sha256=dMJwG27Qo5WsfwzkL7A9X-PERGuGFhpQvP95BnlohJ8,39612
+tksheet/listbox.py,sha256=BUHx-PsZL6yGMewxAaEZV_8mOXCVWenWqzHp3tasGvo,384
+tksheet/main_table.py,sha256=ngwXVNqrtOZPtR-BqCuh7UVAubfB8v_JfdI2peJAzPM,323154
+tksheet/other_classes.py,sha256=Hjr7c0kD2_880xjtGuFn9gQ-7ED5kSiNahniBeXcf84,13604
+tksheet/row_index.py,sha256=NHFu5a35nPMuxajHhpS2RH8sOTYKKKb6WGO8zWofxqs,105354
+tksheet/sheet.py,sha256=PbCa8RCiBYg3Zl_26j1aIKphGst84S2lGHKodnZ6Kk0,256166
+tksheet/sheet_options.py,sha256=mh0rTvWrFvIKaiv88jtMZy0TSA8zTS1GXSe88u8_rzk,11978
+tksheet/text_editor.py,sha256=81_IZKrTVa2KIx2cJ4n3cFvFMAwvbHIQYgqtyat-97I,6681
+tksheet/themes.py,sha256=OwUe31NRbosjw3ZoZsMyB8lNVyYin9YcKLhCturi5q8,13398
+tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
+tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
+tksheet/vars.py,sha256=Iukk7-MMT9X7vv0m3nQPKzbp2Iw2Pg1wJEW7js919Mo,2092
+tksheet-7.1.7.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.1.7.dist-info/METADATA,sha256=w5PeLRxO5tOgSz577YZLks3-OtluVDYw6Kw--fixI8w,6013
+tksheet-7.1.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.1.7.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.1.7.dist-info/RECORD,,

tksheet-7.1.6.dist-info/RECORD

@@ -1,20 +0,0 @@
-tksheet/__init__.py,sha256=95JUoulFU3M59S4BSLtmbHtdYN9bUTph238FEb2u0S8,1874
-tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=2Y5QcT5WmxjXudPszKHcd7hHuTNRfxoRVyKx2bsBGZI,99449
-tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
-tksheet/functions.py,sha256=OZdcbYcKpiU_2YhwPWASZ8QfyF3tRhGiwY80sh5Rbx4,39610
-tksheet/main_table.py,sha256=ThNsmwC_e2o5nEjB53RvIMLaj3rcWEfASeMtt2TTNl4,321201
-tksheet/other_classes.py,sha256=Hjr7c0kD2_880xjtGuFn9gQ-7ED5kSiNahniBeXcf84,13604
-tksheet/row_index.py,sha256=TsAYN0cBchH-diKzU3fuZXlgTOmrODq8EIeT2RcTblk,104750
-tksheet/sheet.py,sha256=_VotKhIMM1aAUmDNPZC4h0_q6NP-sB4nGRRIZ-iggSc,257417
-tksheet/sheet_options.py,sha256=Vcy4RxTKvf2HM-Yc53ex0lpBe6ATXc_pdx4oLhfjDgU,11906
-tksheet/text_editor.py,sha256=81_IZKrTVa2KIx2cJ4n3cFvFMAwvbHIQYgqtyat-97I,6681
-tksheet/themes.py,sha256=OwUe31NRbosjw3ZoZsMyB8lNVyYin9YcKLhCturi5q8,13398
-tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
-tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
-tksheet/vars.py,sha256=Iukk7-MMT9X7vv0m3nQPKzbp2Iw2Pg1wJEW7js919Mo,2092
-tksheet-7.1.6.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.1.6.dist-info/METADATA,sha256=2ZtrwFvnlwzpFt9hY_C_Mpf5ghtHjmRPz65pfc5N1xI,6013
-tksheet-7.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.1.6.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.1.6.dist-info/RECORD,,