tksheet 7.1.3__py3-none-any.whl → 7.1.5__py3-none-any.whl

tksheet/row_index.py

@@ -191,8 +191,7 @@ class RowIndex(tk.Canvas):
                         self.toggle_select_row(r, redraw=True)
                     if self.MT.rc_popup_menus_enabled:
                         popup_menu = self.ri_rc_popup_menu
-        if self.extra_rc_func is not None:
-            self.extra_rc_func(event)
+        try_binding(self.extra_rc_func, event)
         if popup_menu is not None:
             self.popup_menu_loc = r
             popup_menu.tk_popup(event.x_root, event.y_root)
@@ -212,10 +211,9 @@ class RowIndex(tk.Canvas):
                     self.being_drawn_item = True
                     self.being_drawn_item = self.add_selection(r, set_as_current=True, run_binding_func=False)
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.ctrl_selection_binding_func is not None:
-                        self.ctrl_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.ctrl_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif r_selected:
                     self.MT.deselect(r=r)
         elif not self.MT.ctrl_select_enabled:
@@ -246,10 +244,9 @@ class RowIndex(tk.Canvas):
                             set_as_current=True,
                         )
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.ctrl_selection_binding_func is not None:
-                        self.ctrl_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.ctrl_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif r_selected:
                     self.dragged_row = DraggedRowColumn(
                         dragged=r,
@@ -269,15 +266,16 @@ class RowIndex(tk.Canvas):
                     if self.MT.selected and self.MT.selected.type_ == "rows":
                         r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
                         self.MT.deselect("all", redraw=False)
-                        self.being_drawn_item = self.MT.create_selection_box(*self.get_shift_select_box(r, r_to_sel))
+                        self.being_drawn_item = self.MT.create_selection_box(
+                            *self.get_shift_select_box(r, r_to_sel), "rows"
+                        )
                         self.MT.set_currently_selected(r_to_sel, c_to_sel, self.being_drawn_item)
                     else:
                         self.being_drawn_item = self.select_row(r, run_binding_func=False)
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.shift_selection_binding_func is not None:
-                        self.shift_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.shift_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif r_selected:
                     self.dragged_row = DraggedRowColumn(
                         dragged=r,
@@ -365,8 +363,7 @@ class RowIndex(tk.Canvas):
                         self.MT.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
                 self.MT.reset_mouse_motion_creations()
-        if self.extra_motion_func is not None:
-            self.extra_motion_func(event)
+        try_binding(self.extra_motion_func, event)
 
     def double_b1(self, event: object):
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -410,8 +407,7 @@ class RowIndex(tk.Canvas):
                     self.PAR.item(iid, open_=iid not in self.tree_open_ids)
         self.rsz_h = None
         self.mouse_motion(event)
-        if self.extra_double_b1_func is not None:
-            self.extra_double_b1_func(event)
+        try_binding(self.extra_double_b1_func, event)
 
     def b1_press(self, event: object):
         self.MT.unbind("<MouseWheel>")
@@ -484,8 +480,7 @@ class RowIndex(tk.Canvas):
                         self.being_drawn_item = self.select_row(r, redraw=True)
                     elif self.MT.toggle_selection_enabled:
                         self.toggle_select_row(r, redraw=True)
-        if self.extra_b1_press_func is not None:
-            self.extra_b1_press_func(event)
+        try_binding(self.extra_b1_press_func, event)
 
     def b1_motion(self, event: object):
         x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
@@ -576,16 +571,14 @@ class RowIndex(tk.Canvas):
                         else:
                             self.being_drawn_item = self.select_row(self.MT.selected.row, run_binding_func=False)
                         need_redraw = True
-                        if self.drag_selection_binding_func is not None:
-                            self.drag_selection_binding_func(
-                                self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                            )
+                        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)
                 if self.scroll_if_event_offscreen(event):
                     need_redraw = True
             if need_redraw:
                 self.MT.main_table_redraw_grid_and_text(redraw_header=False, redraw_row_index=True)
-        if self.extra_b1_motion_func is not None:
-            self.extra_b1_motion_func(event)
+        try_binding(self.extra_b1_motion_func, event)
 
     def get_b1_motion_box(self, start_row, end_row):
         if end_row >= start_row:
@@ -637,10 +630,9 @@ class RowIndex(tk.Canvas):
                             self.MT.hide_selection_box(self.MT.selected.fill_iid)
                             self.being_drawn_item = self.add_selection(box[0], run_binding_func=False)
                         need_redraw = True
-                        if self.drag_selection_binding_func is not None:
-                            self.drag_selection_binding_func(
-                                self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                            )
+                        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)
                 if self.scroll_if_event_offscreen(event):
                     need_redraw = True
             if need_redraw:
@@ -775,10 +767,9 @@ class RowIndex(tk.Canvas):
                 c_to_sel,
                 item=self.MT.create_selection_box(*to_sel, set_current=False),
             )
-            if self.drag_selection_binding_func is not None:
-                self.drag_selection_binding_func(
-                    self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                )
+            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)
         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
@@ -886,8 +877,7 @@ class RowIndex(tk.Canvas):
         self.rsz_w = None
         self.rsz_h = None
         self.mouse_motion(event)
-        if self.extra_b1_release_func is not None:
-            self.extra_b1_release_func(event)
+        try_binding(self.extra_b1_release_func, event)
 
     def event_over_tree_arrow(
         self,
@@ -1738,7 +1728,7 @@ class RowIndex(tk.Canvas):
             text = event.char
         else:
             return False
-        if self.extra_begin_edit_cell_func is not None:
+        if self.extra_begin_edit_cell_func:
             try:
                 text = self.extra_begin_edit_cell_func(
                     event_dict(
@@ -1768,9 +1758,9 @@ class RowIndex(tk.Canvas):
         if not self.MT.see(r=r, c=0, keep_yscroll=True, check_cell_visibility=True):
             self.MT.refresh()
         x = 0
-        y = self.MT.row_positions[r] + 1
+        y = self.MT.row_positions[r]
         w = self.current_width + 1
-        h = self.MT.row_positions[r + 1] - y
+        h = self.MT.row_positions[r + 1] - y + 1
         datarn = r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
         if text is None:
             text = self.get_cell_data(datarn, none_to_empty_str=True, redirect_int=True)
@@ -1786,12 +1776,12 @@ class RowIndex(tk.Canvas):
                 }
             ),
             "sheet_ops": self.PAR.ops,
-            "border_color": self.PAR.ops.table_selected_cells_border_fg,
+            "border_color": self.PAR.ops.index_selected_rows_bg,
             "text": text,
             "state": state,
             "width": w,
             "height": h,
-            "show_border": self.PAR.ops.show_selected_cells_border,
+            "show_border": True,
             "bg": bg,
             "fg": fg,
             "align": self.get_cell_align(r),
@@ -1821,42 +1811,45 @@ class RowIndex(tk.Canvas):
         return True
 
     def text_editor_newline_binding(self, r=0, c=0, event: object = None, check_lines=True):
-        if self.height_resizing_enabled:
-            curr_height = self.text_editor.window.winfo_height()
-            if (
-                not check_lines
-                or self.MT.get_lines_cell_height(
-                    self.text_editor.window.get_num_lines() + 1,
-                    font=self.PAR.ops.index_font,
-                )
-                > curr_height
-            ):
-                new_height = curr_height + self.MT.index_xtra_lines_increment
-                space_bot = self.MT.get_space_bot(r)
-                if new_height > space_bot:
-                    new_height = space_bot
-                if new_height != curr_height:
-                    self.set_row_height(r, new_height)
-                    self.MT.refresh()
-                    self.text_editor.window.config(height=new_height)
-                    self.coords(self.text_editor.canvas_id, 0, self.MT.row_positions[r] + 1)
-                    if self.dropdown.open and self.dropdown.get_coords() == r:
-                        text_editor_h = self.text_editor.window.winfo_height()
-                        win_h, anchor = self.get_dropdown_height_anchor(r, text_editor_h)
-                        if anchor == "nw":
-                            self.coords(
-                                self.dropdown.canvas_id,
-                                self.MT.col_positions[c],
-                                self.MT.row_positions[r] + text_editor_h - 1,
-                            )
-                            self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
-                        elif anchor == "sw":
-                            self.coords(
-                                self.dropdown.canvas_id,
-                                self.MT.col_positions[c],
-                                self.MT.row_positions[r],
-                            )
-                            self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
+        if not self.height_resizing_enabled:
+            return
+        curr_height = self.text_editor.window.winfo_height()
+        if curr_height < self.MT.min_row_height:
+            return
+        if (
+            not check_lines
+            or self.MT.get_lines_cell_height(
+                self.text_editor.window.get_num_lines() + 1,
+                font=self.PAR.ops.index_font,
+            )
+            > curr_height
+        ):
+            new_height = curr_height + self.MT.index_xtra_lines_increment
+            space_bot = self.MT.get_space_bot(r)
+            if new_height > space_bot:
+                new_height = space_bot
+            if new_height != curr_height:
+                self.set_row_height(r, new_height)
+                self.MT.refresh()
+                self.text_editor.window.config(height=new_height)
+                self.coords(self.text_editor.canvas_id, 0, self.MT.row_positions[r] + 1)
+                if self.dropdown.open and self.dropdown.get_coords() == r:
+                    text_editor_h = self.text_editor.window.winfo_height()
+                    win_h, anchor = self.get_dropdown_height_anchor(r, text_editor_h)
+                    if anchor == "nw":
+                        self.coords(
+                            self.dropdown.canvas_id,
+                            self.MT.col_positions[c],
+                            self.MT.row_positions[r] + text_editor_h - 1,
+                        )
+                        self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
+                    elif anchor == "sw":
+                        self.coords(
+                            self.dropdown.canvas_id,
+                            self.MT.col_positions[c],
+                            self.MT.row_positions[r],
+                        )
+                        self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
 
     def refresh_open_window_positions(self):
         if self.text_editor.open:
@@ -1993,33 +1986,32 @@ class RowIndex(tk.Canvas):
             if not self.open_text_editor(event=event, r=r, dropdown=True):
                 return
         win_h, anchor = self.get_dropdown_height_anchor(r)
+        win_w = self.current_width
         ypos = self.MT.row_positions[r + 1]
-        if self.dropdown.window is not None:
-            self.dropdown.window.search_function = kwargs["search_function"]
-            self.dropdown.window.r = r
-            self.dropdown.window.row = -1
-            self.dropdown.window.set_options()
-            self.dropdown.window.values(kwargs["values"])
-            if not self.dropdown.open:
-                self.itemconfig(self.dropdown.canvas_id, state="normal")
+        reset_kwargs = {
+            "r": r,
+            "c": 0,
+            "width": win_w,
+            "height": win_h,
+            "font": self.PAR.ops.index_font,
+            "ops": self.PAR.ops,
+            "outline_color": self.PAR.ops.popup_menu_fg,
+            "align": self.get_cell_align(r),
+            "values": kwargs["values"],
+        }
+        if self.dropdown.window:
+            self.dropdown.window.reset(**reset_kwargs)
+            self.itemconfig(self.dropdown.canvas_id, state="normal")
             self.coords(self.dropdown.canvas_id, 0, ypos)
         else:
             self.dropdown.window = self.PAR.dropdown_class(
-                self.MT.winfo_toplevel(),
-                r,
-                0,
-                width=self.current_width,
-                height=win_h,
-                font=self.PAR.ops.index_font,
-                ops=self.PAR.ops,
-                outline_color=self.PAR.ops.popup_menu_fg,
-                values=kwargs["values"],
+                self.winfo_toplevel(),
+                **reset_kwargs,
+                single_index="r",
                 close_dropdown_window=self.close_dropdown_window,
                 search_function=kwargs["search_function"],
                 arrowkey_RIGHT=self.MT.arrowkey_RIGHT,
                 arrowkey_LEFT=self.MT.arrowkey_LEFT,
-                align="w",
-                single_index="r",
             )
             self.dropdown.canvas_id = self.create_window(
                 (0, ypos),