From f53b4b28597df456f134b5dd3cd429a66e35c480 Mon Sep 17 00:00:00 2001 From: GingerIndustries <75683114+GingerIndustries@users.noreply.github.com> Date: Wed, 24 Nov 2021 16:25:20 -0500 Subject: [PATCH 1/2] Update grid_layout.py Added the ability to change the divider line color --- adafruit_displayio_layout/layouts/grid_layout.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/adafruit_displayio_layout/layouts/grid_layout.py b/adafruit_displayio_layout/layouts/grid_layout.py index e63d6ac..bbdcfc3 100644 --- a/adafruit_displayio_layout/layouts/grid_layout.py +++ b/adafruit_displayio_layout/layouts/grid_layout.py @@ -59,6 +59,7 @@ def __init__( divider_lines=False, h_divider_line_rows=None, v_divider_line_cols=None, + divider_line_color=0xFFFFFF, ): super().__init__(x=x, y=y) self.x = x @@ -70,6 +71,7 @@ def __init__( self._cell_content_list = [] self._divider_lines = [] + self._divider_color = divider_line_color self.h_divider_line_rows = h_divider_line_rows self.v_divider_line_cols = v_divider_line_cols @@ -164,8 +166,8 @@ def _layout_cells(self): if self._divider_lines_enabled: palette = displayio.Palette(2) - palette[0] = 0xFFFFFF - palette[1] = 0xFFFFFF + palette[0] = self._divider_color + palette[1] = self._divider_color if not hasattr(cell["content"], "anchor_point"): _bottom_line_loc_y = ( From d0e83e1e3cbc12aab5425a068c089699681b5cd2 Mon Sep 17 00:00:00 2001 From: GingerIndustries <75683114+GingerIndustries@users.noreply.github.com> Date: Fri, 26 Nov 2021 07:31:04 -0500 Subject: [PATCH 2/2] Fixed pylint and added docstring --- adafruit_displayio_layout/layouts/grid_layout.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adafruit_displayio_layout/layouts/grid_layout.py b/adafruit_displayio_layout/layouts/grid_layout.py index bbdcfc3..e3b1a50 100644 --- a/adafruit_displayio_layout/layouts/grid_layout.py +++ b/adafruit_displayio_layout/layouts/grid_layout.py @@ -44,10 +44,12 @@ class GridLayout(displayio.Group): lines above. Row indexes are 0 based. :param Union[tuple, list] v_divider_line_cols: Column indexes to draw divider lines before. Column indexes are 0 based. + :param divider_line_color: The color of the divider lines (in hexadecimal) """ # pylint: disable=too-many-arguments + # pylint: disable=too-many-instance-attributes def __init__( self, x,