hiding grid and using highlights caused gaps resembling grid

address #313

Author: ragardner

docs/CHANGELOG.md

@@ -1,3 +1,7 @@
+### Version 7.5.15
+#### Addressed:
+- [#313](https://github.com/ragardner/tksheet/issues/313).
+
 ### Version 7.5.14
 #### Removed:
 - Removed settings for cut_contents, copy_contents and the new plain equivalent added in `7.5.13`. These settings now use the same as the usual cut and copy settings.

pyproject.toml

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

tksheet/__init__.py

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

tksheet/column_headers.py

@@ -1380,16 +1380,17 @@ def redraw_highlight(
         outline: str,
         tags: str | tuple[str],
     ) -> bool:
-        coords = (x1, y1, x2, y2)
+        if not self.ops.show_vertical_grid:
+            x2 += 1
         if self.hidd_high:
             iid, showing = self.hidd_high.popitem()
-            self.coords(iid, coords)
+            self.coords(iid, x1, y1, x2, y2)
             if showing:
                 self.itemconfig(iid, fill=fill, outline=outline, tags=tags)
             else:
                 self.itemconfig(iid, fill=fill, outline=outline, state="normal", tags=tags)
         else:
-            iid = self.create_rectangle(coords, fill=fill, outline=outline, tags=tags)
+            iid = self.create_rectangle(x1, y1, x2, y2, fill=fill, outline=outline, tags=tags)
         self.disp_high[iid] = True
         return True
 

tksheet/main_table.py

@@ -5783,7 +5783,6 @@ def redraw_highlight_get_text_fg(
         has_dd: bool,
         tags: str | tuple[str],
     ) -> tuple[str, bool]:
-        redrawn = False
         if (datarn, datacn) in self.progress_bars:
             kwargs = self.progress_bars[(datarn, datacn)]
         else:
@@ -5816,7 +5815,7 @@ def redraw_highlight_get_text_fg(
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
                 )
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5843,7 +5842,7 @@ def redraw_highlight_get_text_fg(
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
                 )
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5870,7 +5869,7 @@ def redraw_highlight_get_text_fg(
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
                 )
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5895,7 +5894,7 @@ def redraw_highlight_get_text_fg(
                 txtfg = self.PAR.ops.table_fg if kwargs[1] is None else kwargs[1]
                 if high_bg:  # Only draw if fill exists
                     if not isinstance(kwargs, ProgressBar):
-                        redrawn = self.redraw_highlight(
+                        self.redraw_highlight(
                             x1=fc + 1,
                             y1=fr + 1,
                             x2=sc,
@@ -5910,7 +5909,7 @@ def redraw_highlight_get_text_fg(
                         if kwargs.del_when_done and kwargs.percent >= 100:
                             del self.progress_bars[(datarn, datacn)]
                         else:
-                            redrawn = self.redraw_highlight(
+                            self.redraw_highlight(
                                 x1=fc + 1,
                                 y1=fr + 1,
                                 x2=sc,
@@ -5925,7 +5924,7 @@ def redraw_highlight_get_text_fg(
         elif not kwargs:
             if "cells" in selections and (r, c) in selections["cells"]:
                 txtfg = self.PAR.ops.table_selected_cells_fg
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5938,7 +5937,7 @@ def redraw_highlight_get_text_fg(
                 )
             elif "rows" in selections and r in selections["rows"]:
                 txtfg = self.PAR.ops.table_selected_rows_fg
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5951,7 +5950,7 @@ def redraw_highlight_get_text_fg(
                 )
             elif "columns" in selections and c in selections["columns"]:
                 txtfg = self.PAR.ops.table_selected_columns_fg
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5964,7 +5963,7 @@ def redraw_highlight_get_text_fg(
                 )
             else:
                 txtfg = self.PAR.ops.table_fg
-                redrawn = self.redraw_highlight(
+                self.redraw_highlight(
                     x1=fc + 1,
                     y1=fr + 1,
                     x2=sc,
@@ -5975,7 +5974,7 @@ def redraw_highlight_get_text_fg(
                     can_width=None,
                     pc=None,
                 )
-        return txtfg, redrawn
+        return txtfg
 
     def redraw_highlight(
         self,
@@ -5989,6 +5988,10 @@ def redraw_highlight(
         can_width: None | float = None,
         pc: None | float = None,
     ) -> bool:
+        if not self.PAR.ops.show_horizontal_grid:
+            y2 += 1
+        if not self.PAR.ops.show_vertical_grid:
+            x2 += 1
         if not is_type_int(pc) or pc >= 100:
             coords = (
                 x1 - 1 if outline else x1,
@@ -6332,7 +6335,7 @@ def redraw_grid_and_text(
                 disp_loc = (r, c)
                 loc = (datarn, datacn)
                 tag = f"{r}_{c}"
-                fill, _ = self.redraw_highlight_get_text_fg(
+                fill = self.redraw_highlight_get_text_fg(
                     r=r,
                     c=c,
                     fc=cleftgridln,

tksheet/row_index.py

@@ -1427,16 +1427,17 @@ def redraw_highlight(
         outline: str,
         tags: str | tuple[str],
     ) -> bool:
-        coords = (x1, y1, x2, y2)
+        if not self.ops.show_horizontal_grid:
+            y2 += 1
         if self.hidd_high:
             iid, showing = self.hidd_high.popitem()
-            self.coords(iid, coords)
+            self.coords(iid, x1, y1, x2, y2)
             if showing:
                 self.itemconfig(iid, fill=fill, outline=outline, tags=tags)
             else:
                 self.itemconfig(iid, fill=fill, outline=outline, state="normal", tags=tags)
         else:
-            iid = self.create_rectangle(coords, fill=fill, outline=outline, tags=tags)
+            iid = self.create_rectangle(x1, y1, x2, y2, fill=fill, outline=outline, tags=tags)
         self.disp_high[iid] = True
         return True