tksheet 7.2.23__py3-none-any.whl → 7.3.1__py3-none-any.whl

tksheet/row_index.py

@@ -5,7 +5,6 @@ from collections import defaultdict
 from collections.abc import (
     Generator,
     Hashable,
-    Iterator,
     Sequence,
 )
 from functools import (
@@ -35,13 +34,15 @@ from .formatters import (
 )
 from .functions import (
     consecutive_chunks,
+    consecutive_ranges,
     event_dict,
     get_n2a,
+    int_x_tuple,
     is_contiguous,
     new_tk_event,
     num2alpha,
-    stored_event_dict,
     rounded_box_coords,
+    stored_event_dict,
     try_binding,
 )
 from .other_classes import (
@@ -54,6 +55,9 @@ from .other_classes import (
 from .text_editor import (
     TextEditor,
 )
+from .types import (
+    AnyIter,
+)
 from .vars import (
     rc_binding,
     symbols_set,
@@ -74,6 +78,7 @@ class RowIndex(tk.Canvas):
         self.MT = None  # is set from within MainTable() __init__
         self.CH = None  # is set from within MainTable() __init__
         self.TL = None  # is set from within TopLeftRectangle() __init__
+        self.current_width = None
         self.popup_menu_loc = None
         self.extra_begin_edit_cell_func = None
         self.extra_end_edit_cell_func = None
@@ -95,7 +100,6 @@ class RowIndex(tk.Canvas):
         self.ri_extra_end_drag_drop_func = None
         self.extra_double_b1_func = None
         self.row_height_resize_func = None
-        self.new_row_width = 0
         self.cell_options = {}
         self.drag_and_drop_enabled = False
         self.dragged_row = None
@@ -178,13 +182,15 @@ class RowIndex(tk.Canvas):
             self.MT.saved_row_heights = {}
 
     def set_width(self, new_width: int, set_TL: bool = False, recreate_selection_boxes: bool = True) -> None:
-        self.current_width = new_width
         try:
             self.config(width=new_width)
         except Exception:
             return
         if set_TL:
-            self.TL.set_dimensions(new_w=new_width, recreate_selection_boxes=recreate_selection_boxes)
+            self.TL.set_dimensions(new_w=new_width)
+        if isinstance(self.current_width, int) and new_width > self.current_width and recreate_selection_boxes:
+            self.MT.recreate_all_selection_boxes()
+        self.current_width = new_width
 
     def rc(self, event: object) -> None:
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -480,11 +486,6 @@ class RowIndex(tk.Canvas):
             self.MT.create_resize_line(x1, line2y, x2, line2y, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rhl2")
         elif self.width_resizing_enabled and self.rsz_h is None and self.rsz_w is True:
             self.currently_resizing_width = True
-            x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
-            x = int(event.x)
-            if x < self.MT.min_column_width:
-                x = int(self.MT.min_column_width)
-            self.new_row_width = x
         elif self.MT.identify_row(y=event.y, allow_end=False) is None:
             self.MT.deselect("all")
         elif self.row_selection_enabled and self.rsz_h is None and self.rsz_w is None:
@@ -513,7 +514,7 @@ class RowIndex(tk.Canvas):
         if self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
             y = self.canvasy(event.y)
             size = y - self.MT.row_positions[self.rsz_h - 1]
-            if size >= self.MT.min_row_height and size < self.MT.max_row_height:
+            if size >= self.MT.min_row_height and size < self.PAR.ops.max_row_height:
                 self.hide_resize_and_ctrl_lines(ctrl_lines=False)
                 line2y = self.MT.row_positions[self.rsz_h - 1]
                 self.create_resize_line(
@@ -548,18 +549,14 @@ class RowIndex(tk.Canvas):
         elif self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
             evx = event.x
             if evx > self.current_width:
-                x = self.MT.canvasx(evx - self.current_width)
-                if evx > self.MT.max_index_width:
-                    evx = int(self.MT.max_index_width)
-                    x = self.MT.canvasx(evx - self.current_width)
-                self.new_row_width = evx
+                if evx > self.PAR.ops.max_index_width:
+                    evx = int(self.PAR.ops.max_index_width)
+                self.drag_width_resize(evx)
             else:
-                x = evx
-                if x < self.MT.min_column_width:
-                    x = int(self.MT.min_column_width)
-                self.new_row_width = x
-            self.drag_width_resize()
-        if (
+                if evx < self.PAR.ops.min_column_width:
+                    evx = self.PAR.ops.min_column_width
+                self.drag_width_resize(evx)
+        elif (
             self.drag_and_drop_enabled
             and self.row_selection_enabled
             and self.MT.anything_selected(exclude_cells=True, exclude_columns=True)
@@ -777,9 +774,9 @@ class RowIndex(tk.Canvas):
             and event.x < self.MT.index_txt_height + 4
         )
 
-    def drag_width_resize(self) -> None:
-        self.set_width(self.new_row_width, set_TL=True)
-        self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
+    def drag_width_resize(self, width: int) -> None:
+        self.set_width(width, set_TL=True)
+        self.MT.main_table_redraw_grid_and_text(redraw_header=False, redraw_row_index=True, redraw_table=False)
 
     def drag_height_resize(self) -> None:
         new_row_pos = int(self.coords("rhl")[1])
@@ -787,8 +784,8 @@ class RowIndex(tk.Canvas):
         size = new_row_pos - self.MT.row_positions[self.rsz_h - 1]
         if size < self.MT.min_row_height:
             new_row_pos = ceil(self.MT.row_positions[self.rsz_h - 1] + self.MT.min_row_height)
-        elif size > self.MT.max_row_height:
-            new_row_pos = floor(self.MT.row_positions[self.rsz_h - 1] + self.MT.max_row_height)
+        elif size > self.PAR.ops.max_row_height:
+            new_row_pos = floor(self.MT.row_positions[self.rsz_h - 1] + self.PAR.ops.max_row_height)
         increment = new_row_pos - self.MT.row_positions[self.rsz_h]
         self.MT.row_positions[self.rsz_h + 1 :] = [
             e + increment for e in islice(self.MT.row_positions, self.rsz_h + 1, None)
@@ -822,12 +819,8 @@ class RowIndex(tk.Canvas):
         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.drag_height_resize()
-            self.currently_resizing_height = False
             self.hide_resize_and_ctrl_lines(ctrl_lines=False)
-        elif self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
-            self.currently_resizing_width = False
-            self.drag_width_resize()
-        if (
+        elif (
             self.drag_and_drop_enabled
             and self.MT.anything_selected(exclude_cells=True, exclude_columns=True)
             and self.row_selection_enabled
@@ -955,20 +948,31 @@ class RowIndex(tk.Canvas):
 
     def select_row(
         self,
-        r: int,
+        r: int | AnyIter[int],
         redraw: bool = False,
         run_binding_func: bool = True,
         ext: bool = False,
     ) -> int:
         boxes_to_hide = tuple(self.MT.selection_boxes)
-        fill_iid = self.MT.create_selection_box(r, 0, r + 1, len(self.MT.col_positions) - 1, "rows", ext=ext)
+        fill_iids = [
+            self.MT.create_selection_box(
+                start,
+                0,
+                end,
+                len(self.MT.col_positions) - 1,
+                "rows",
+                set_current=True,
+                ext=ext,
+            )
+            for start, end in consecutive_ranges(int_x_tuple(r))
+        ]
         for iid in boxes_to_hide:
             self.MT.hide_selection_box(iid)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
             self.MT.run_selection_binding("rows")
-        return fill_iid
+        return fill_iids[0] if len(fill_iids) == 1 else fill_iids
 
     def add_selection(
         self,
@@ -1092,8 +1096,8 @@ class RowIndex(tk.Canvas):
             return self.MT.row_positions[row + 1] - self.MT.row_positions[row]
         if h < self.MT.min_row_height:
             h = int(self.MT.min_row_height)
-        elif h > self.MT.max_row_height:
-            h = int(self.MT.max_row_height)
+        elif h > self.PAR.ops.max_row_height:
+            h = int(self.PAR.ops.max_row_height)
         return h
 
     def set_row_height(
@@ -1108,8 +1112,8 @@ class RowIndex(tk.Canvas):
             height = self.get_row_text_height(row=row, visible_only=visible_only)
         if height < self.MT.min_row_height:
             height = int(self.MT.min_row_height)
-        elif height > self.MT.max_row_height:
-            height = int(self.MT.max_row_height)
+        elif height > self.PAR.ops.max_row_height:
+            height = int(self.PAR.ops.max_row_height)
         if only_if_too_small and height <= self.MT.row_positions[row + 1] - self.MT.row_positions[row]:
             return self.MT.row_positions[row + 1] - self.MT.row_positions[row]
         new_row_pos = self.MT.row_positions[row] + height
@@ -1124,7 +1128,7 @@ class RowIndex(tk.Canvas):
 
     def get_index_text_width(
         self,
-        only_rows: Iterator[int] | None = None,
+        only_rows: AnyIter[int] | None = None,
     ) -> int:
         self.fix_index()
         w = self.PAR.ops.default_row_index_width
@@ -1143,8 +1147,8 @@ class RowIndex(tk.Canvas):
             iterable = self.MT.displayed_rows
         if (new_w := max(map(itemgetter(0), map(self.get_cell_dimensions, iterable)), default=w)) > w:
             w = new_w
-        if w > self.MT.max_index_width:
-            w = int(self.MT.max_index_width)
+        if w > self.PAR.ops.max_index_width:
+            w = int(self.PAR.ops.max_index_width)
         return w
 
     def set_width_of_index_to_text(
@@ -1165,8 +1169,8 @@ class RowIndex(tk.Canvas):
                 w = tw
         elif text is None:
             w = self.get_index_text_width(only_rows=only_rows)
-        if w > self.MT.max_index_width:
-            w = int(self.MT.max_index_width)
+        if w > self.PAR.ops.max_index_width:
+            w = int(self.PAR.ops.max_index_width)
         self.set_width(w, set_TL=True)
         self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         return w
@@ -1637,7 +1641,7 @@ class RowIndex(tk.Canvas):
                         outline=fill,
                         tag="dd",
                         draw_outline=not dd_drawn,
-                        draw_arrow=mw >= 5,
+                        draw_arrow=True,
                         open_=dd_coords == r,
                     )
                 else:
@@ -1656,7 +1660,7 @@ class RowIndex(tk.Canvas):
                         outline=fill,
                         tag="dd",
                         draw_outline=not dd_drawn,
-                        draw_arrow=mw >= 5,
+                        draw_arrow=True,
                         open_=dd_coords == r,
                     )
                 else:
@@ -1676,7 +1680,7 @@ class RowIndex(tk.Canvas):
                         outline=fill,
                         tag="dd",
                         draw_outline=not dd_drawn,
-                        draw_arrow=mw >= 5,
+                        draw_arrow=True,
                         open_=dd_coords == r,
                     )
                 else:
@@ -1785,7 +1789,7 @@ class RowIndex(tk.Canvas):
                                     txt = txt[:-1]
                                     self.itemconfig(iid, text=txt)
                                     wd = self.bbox(iid)
-                            elif align == "e" and (dropdown_kwargs or checkbox_kwargs):
+                            elif align == "e" and checkbox_kwargs:
                                 txt = txt[len(txt) - int(len(txt) * (mw / wd)) :]
                                 self.itemconfig(iid, text=txt)
                                 wd = self.bbox(iid)