tksheet 7.1.24__tar.gz → 7.2.0__tar.gz

{tksheet-7.1.24/tksheet.egg-info → tksheet-7.2.0}/PKG-INFO

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

{tksheet-7.1.24 → tksheet-7.2.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.1.24"
+version = "7.2.0"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/__init__.py

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

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/column_headers.py

@@ -771,11 +771,9 @@ class ColumnHeaders(tk.Canvas):
         return False
 
     def b1_release(self, event: object) -> None:
-        if self.being_drawn_item is not None:
-            to_sel = self.MT.coords_and_type(self.being_drawn_item)
+        if self.being_drawn_item is not None and (to_sel := self.MT.coords_and_type(self.being_drawn_item)):
             r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
             self.MT.hide_selection_box(self.being_drawn_item)
-            self.being_drawn_item = None
             self.MT.set_currently_selected(
                 r_to_sel,
                 c_to_sel,
@@ -784,6 +782,8 @@ class ColumnHeaders(tk.Canvas):
             sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
             try_binding(self.drag_selection_binding_func, sel_event)
             self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
+        else:
+            self.being_drawn_item = None
         self.MT.bind("<MouseWheel>", self.MT.mousewheel)
         if self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
             self.currently_resizing_width = False
@@ -1607,11 +1607,11 @@ class ColumnHeaders(tk.Canvas):
 
     def get_redraw_selections(self, startc: int, endc: int) -> dict[str, set[int]]:
         d = defaultdict(set)
-        for item, box in self.MT.get_selection_items(rows=False):
+        for item, box in self.MT.get_selection_items():
             r1, c1, r2, c2 = box.coords
             for c in range(startc, endc):
                 if c1 <= c and c2 > c:
-                    d[box.type_].add(c)
+                    d[box.type_ if box.type_ != "rows" else "cells"].add(c)
         return d
 
     def open_cell(self, event: object = None, ignore_existing_editor=False):

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/main_table.py

@@ -3079,11 +3079,9 @@ class MainTable(tk.Canvas):
             self.b1_motion(event)
 
     def b1_release(self, event=None):
-        if self.being_drawn_item is not None:
-            to_sel = self.coords_and_type(self.being_drawn_item)
+        if self.being_drawn_item is not None and (to_sel := self.coords_and_type(self.being_drawn_item)):
             r_to_sel, c_to_sel = self.selected.row, self.selected.column
             self.hide_selection_box(self.being_drawn_item)
-            self.being_drawn_item = None
             self.set_currently_selected(
                 r_to_sel,
                 c_to_sel,
@@ -3101,6 +3099,8 @@ class MainTable(tk.Canvas):
             if self.drag_selection_binding_func:
                 self.drag_selection_binding_func(sel_event)
             self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
+        else:
+            self.being_drawn_item = None
         if self.RI.width_resizing_enabled and self.RI.rsz_w is not None and self.RI.currently_resizing_width:
             self.delete_resize_lines()
             self.RI.delete_resize_lines()
@@ -3466,7 +3466,7 @@ class MainTable(tk.Canvas):
     def get_lines_cell_height(self, n, font=None):
         return (
             self.get_txt_h(
-                txt="\n".join("|" for lines in range(n)) if n > 1 else "|",
+                txt="\n".join("|" for _ in range(n)) if n > 1 else "|",
                 font=self.PAR.ops.table_font if font is None else font,
             )
             + 5
@@ -3484,12 +3484,20 @@ class MainTable(tk.Canvas):
 
     def get_default_row_height(self) -> int:
         if isinstance(self.PAR.ops.default_row_height, str):
-            return self.get_lines_cell_height(int(self.PAR.ops.default_row_height))
+            if int(self.PAR.ops.default_row_height) == 1:
+                return self.min_row_height
+            else:
+                return self.min_row_height + self.get_lines_cell_height(int(self.PAR.ops.default_row_height) - 1)
         return self.PAR.ops.default_row_height
 
     def get_default_header_height(self) -> int:
         if isinstance(self.PAR.ops.default_header_height, str):
-            return self.get_lines_cell_height(int(self.PAR.ops.default_header_height), font=self.PAR.ops.header_font)
+            if int(self.PAR.ops.default_header_height) == 1:
+                return self.min_header_height
+            else:
+                return self.min_header_height + self.get_lines_cell_height(
+                    int(self.PAR.ops.default_header_height) - 1, font=self.PAR.ops.header_font
+                )
         return self.PAR.ops.default_header_height
 
     def set_table_font(self, newfont: tuple | None = None, reset_row_positions: bool = False) -> tuple[str, int, str]:
@@ -3519,8 +3527,8 @@ class MainTable(tk.Canvas):
             self.table_first_ln_ins = self.table_half_txt_height + 2
         else:
             self.table_first_ln_ins = self.table_half_txt_height + 3
+        self.min_row_height = int(self.table_first_ln_ins * 2.25)
         self.table_xtra_lines_increment = int(self.table_txt_height)
-        self.min_row_height = self.table_txt_height + 5
         if self.min_row_height < 12:
             self.min_row_height = 12
         self.set_min_column_width()
@@ -3548,7 +3556,7 @@ class MainTable(tk.Canvas):
         else:
             self.header_first_ln_ins = self.header_half_txt_height + 3
         self.header_xtra_lines_increment = self.header_txt_height
-        self.min_header_height = self.header_txt_height + 5
+        self.min_header_height = int(self.header_first_ln_ins * 2.25)
         if (
             isinstance(self.PAR.ops.default_header_height, int)
             and self.PAR.ops.default_header_height < self.min_header_height
@@ -5381,6 +5389,10 @@ class MainTable(tk.Canvas):
         if resized_cols or resized_rows or changed_w:
             self.recreate_all_selection_boxes()
             if changed_w:
+                self.update_idletasks()
+                self.RI.update_idletasks()
+                self.CH.update_idletasks()
+                self.TL.update_idletasks()
                 return False
         self.hidd_text.update(self.disp_text)
         self.disp_text = {}
@@ -5934,6 +5946,8 @@ class MainTable(tk.Canvas):
         if self.selected.fill_iid == item:
             self.hide_selected()
             self.set_current_to_last()
+        if item == self.being_drawn_item:
+            self.being_drawn_item = None
         return True
 
     def hide_selected(self) -> None:
@@ -6996,9 +7010,9 @@ class MainTable(tk.Canvas):
         return self.mouseclick_outside_editor_or_dropdown()
 
     def hide_dropdown_editor_all_canvases(self):
-        self.hide_text_editor_and_dropdown()
-        self.RI.hide_text_editor_and_dropdown()
-        self.CH.hide_text_editor_and_dropdown()
+        self.hide_text_editor_and_dropdown(redraw=False)
+        self.RI.hide_text_editor_and_dropdown(redraw=False)
+        self.CH.hide_text_editor_and_dropdown(redraw=False)
 
     def hide_dropdown_window(self) -> None:
         if self.dropdown.open:

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/row_index.py

@@ -772,11 +772,9 @@ class RowIndex(tk.Canvas):
         return False
 
     def b1_release(self, event: object) -> None:
-        if self.being_drawn_item is not None:
-            to_sel = self.MT.coords_and_type(self.being_drawn_item)
+        if self.being_drawn_item is not None and (to_sel := self.MT.coords_and_type(self.being_drawn_item)):
             r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
             self.MT.hide_selection_box(self.being_drawn_item)
-            self.being_drawn_item = None
             self.MT.set_currently_selected(
                 r_to_sel,
                 c_to_sel,
@@ -785,6 +783,8 @@ class RowIndex(tk.Canvas):
             sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
             try_binding(self.drag_selection_binding_func, sel_event)
             self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
+        else:
+            self.being_drawn_item = None
         self.MT.bind("<MouseWheel>", self.MT.mousewheel)
         if self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
             self.currently_resizing_height = False
@@ -1030,7 +1030,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) + 4
+            w += self.get_treeview_indent(self.MT._row_index[datarn].iid) + 5
         return w, h
 
     def set_row_height(
@@ -1310,7 +1310,8 @@ class RowIndex(tk.Canvas):
         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
+        small_mod = int(half_mod / 4) - 1
+        mid_y = int(self.MT.min_row_height / 2)
         # up arrow
         if open_:
             points = (
@@ -1325,11 +1326,11 @@ class RowIndex(tk.Canvas):
         else:
             points = (
                 x1 + half_mod + indent,
-                y1 + mid_y - half_mod + 1,
-                x1 + mod + indent - 1,
+                y1 + mid_y - half_mod + small_mod,
+                x1 + mod + indent - small_mod,
                 y1 + mid_y,
                 x1 + half_mod + indent,
-                y1 + mid_y + half_mod - 1,
+                y1 + mid_y + half_mod - small_mod,
             )
         if self.hidd_tree_arrow:
             t, sh = self.hidd_tree_arrow.popitem()
@@ -1340,10 +1341,13 @@ class RowIndex(tk.Canvas):
                 self.itemconfig(t, fill=fill, tag=tag, state="normal")
             self.lift(t)
         else:
-            t = self.create_polygon(
+            t = self.create_line(
                 points,
                 fill=fill,
                 tag=tag,
+                width=2,
+                capstyle=tk.ROUND,
+                joinstyle=tk.BEVEL,
             )
         self.disp_tree_arrow[t] = True
 
@@ -1633,7 +1637,7 @@ class RowIndex(tk.Canvas):
                 if align == "w":
                     draw_x += self.MT.index_txt_height + 1
                 indent = self.get_treeview_indent(iid)
-                draw_x += indent + 4
+                draw_x += indent + 5
                 if self.tree[iid].children:
                     self.redraw_tree_arrow(
                         0,
@@ -1738,11 +1742,11 @@ class RowIndex(tk.Canvas):
 
     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):
+        for item, box in self.MT.get_selection_items():
             r1, c1, r2, c2 = box.coords
             for r in range(startr, endr):
                 if r1 <= r and r2 > r:
-                    d[box.type_].add(r)
+                    d[box.type_ if box.type_ != "columns" else "cells"].add(r)
         return d
 
     def open_cell(self, event: object = None, ignore_existing_editor=False):

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/sheet.py

@@ -21,6 +21,7 @@ from .functions import (
     dropdown_search_function,
     event_dict,
     fix_format_kwargs,
+    new_tk_event,
     force_bool,
     get_checkbox_dict,
     get_checkbox_kwargs,
@@ -29,7 +30,6 @@ from .functions import (
     idx_param_to_int,
     is_iterable,
     key_to_span,
-    new_tk_event,
     num2alpha,
     pickled_event_dict,
     pop_positions,
@@ -1464,6 +1464,8 @@ class Sheet(tk.Frame):
         undo_stack: bool = True,
         selections: bool = True,
         sheet_options: bool = False,
+        displayed_rows: bool = True,
+        displayed_columns: bool = True,
         tree: bool = True,
         redraw: bool = True,
     ) -> Sheet:
@@ -1476,6 +1478,12 @@ class Sheet(tk.Frame):
         if index:
             self.RI.hide_text_editor_and_dropdown(redraw=False)
             self.MT._row_index = []
+        if displayed_columns:
+            self.MT.displayed_columns = []
+            self.MT.all_columns_displayed = True
+        if displayed_rows:
+            self.MT.displayed_rows = []
+            self.MT.all_rows_displayed = True
         if row_heights:
             self.MT.saved_row_heights = {}
             self.MT.set_row_positions([])
@@ -3584,6 +3592,20 @@ class Sheet(tk.Frame):
             z < self.MT.min_column_width or not isinstance(z, int) or isinstance(z, bool) for z in column_widths
         )
 
+    def valid_row_height(self, height: int) -> int:
+        if height < self.MT.min_row_height:
+            return self.MT.min_row_height
+        elif height > self.MT.max_row_height:
+            return self.MT.max_row_height
+        return height
+
+    def valid_column_width(self, width: int) -> int:
+        if width < self.MT.min_column_width:
+            return self.MT.min_column_width
+        elif width > self.MT.max_column_width:
+            return self.MT.max_column_width
+        return width
+
     # Identifying Bound Event Mouse Position
 
     def identify_region(self, event: object) -> Literal["table", "index", "header", "top left"]:
@@ -4512,6 +4534,7 @@ class Sheet(tk.Frame):
         safety: bool = True,
         ncols: int | None = None,
     ) -> Sheet:
+        self.reset(cell_options=False, column_widths=False, header=False, redraw=False)
         if text_column is None:
             text_column = iid_column
         tally_of_ids = defaultdict(lambda: -1)
@@ -4564,6 +4587,8 @@ class Sheet(tk.Frame):
             fill=False,
             push_ops=push_ops,
         )
+        self.MT.all_rows_displayed = False
+        self.MT.displayed_rows = list(range(len(self.MT._row_index)))
         self.RI.tree_rns = {n.iid: i for i, n in enumerate(self.MT._row_index)}
         if open_ids:
             self.tree_set_open(open_ids=open_ids)
@@ -4614,10 +4639,17 @@ class Sheet(tk.Frame):
         Only meant for internal use
         """
         to_open = []
+        disp_set = set(self.MT.displayed_rows)
+        quick_rns = self.RI.tree_rns
+        quick_open_ids = self.RI.tree_open_ids
         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))
+                quick_open_ids.add(item)
+                if quick_rns[item] in disp_set:
+                    to_disp = [quick_rns[did] for did in self.RI.get_iid_descendants(item, check_open=True)]
+                    for i in to_disp:
+                        disp_set.add(i)
+                    to_open.extend(to_disp)
         return to_open
 
     def tree_open(self, *items, redraw: bool = True) -> Sheet:
@@ -4627,36 +4659,37 @@ class Sheet(tk.Frame):
         if items := set(unpack(items)):
             to_open = self._tree_open(items)
         else:
-            to_open = []
-            for item in 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))
+            to_open = self._tree_open(set(self.get_children()))
         return self.show_rows(
             rows=to_open,
             redraw=redraw,
             deselect_all=False,
         )
 
+    def _tree_close(self, items: Iterator[str]) -> list[int]:
+        """
+        Only meant for internal use
+        """
+        to_close = set()
+        disp_set = set(self.MT.displayed_rows)
+        quick_rns = self.RI.tree_rns
+        quick_open_ids = self.RI.tree_open_ids
+        for item in items:
+            if self.RI.tree[item].children:
+                quick_open_ids.discard(item)
+                if quick_rns[item] in disp_set:
+                    for did in self.RI.get_iid_descendants(item, check_open=True):
+                        to_close.add(quick_rns[did])
+        return to_close
+
     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):
-                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])
+            to_close = self._tree_close(unpack(items))
         else:
-            for item in self.get_children():
-                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])
+            to_close = self._tree_close(self.get_children())
         return self.hide_rows(
             rows=to_close,
             redraw=redraw,

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/text_editor.py

@@ -26,7 +26,7 @@ class TextEditorTkText(tk.Text):
             self,
             parent,
             spacing1=0,
-            spacing2=0,
+            spacing2=1,
             spacing3=0,
             bd=0,
             highlightthickness=0,

{tksheet-7.1.24 → tksheet-7.2.0}/tksheet/themes.py

@@ -46,8 +46,8 @@ 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",
+    "tree_arrow_fg": "black",
+    "selected_cells_tree_arrow_fg": "black",
     "selected_rows_tree_arrow_fg": "#FFFFFF",
     "vertical_scroll_background": "#FFFFFF",
     "horizontal_scroll_background": "#FFFFFF",
@@ -121,7 +121,7 @@ theme_light_green: dict[str, str] = DotDict({
     "table_selected_columns_border_fg": "#107C41",
     "table_selected_columns_bg": "#E3E3E3",
     "table_selected_columns_fg": "black",
-    "tree_arrow_fg": "#ababab",
+    "tree_arrow_fg": "black",
     "selected_cells_tree_arrow_fg": "#107C41",
     "selected_rows_tree_arrow_fg": "#FFFFFF",
     "vertical_scroll_background": "#FFFFFF",
@@ -272,8 +272,8 @@ theme_black: dict[str, str] = DotDict({
     "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",
+    "selected_cells_tree_arrow_fg": "#FBB86C",
+    "selected_rows_tree_arrow_fg": "#000000",
     "vertical_scroll_background": "#3b3a39",
     "horizontal_scroll_background": "#3b3a39",
     "vertical_scroll_troughcolor": "#000000",

{tksheet-7.1.24 → tksheet-7.2.0/tksheet.egg-info}/PKG-INFO

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