Skip to content

remove displayio.Shape usage and replace with vectorio.Rectangle #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2023
+19 −32
Merged

remove displayio.Shape usage and replace with vectorio.Rectangle #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 19 additions & 32 deletions adafruit_displayio_layout/layouts/grid_layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import math
import displayio
from vectorio import Rectangle

__version__ = "0.0.0+auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
Expand Down Expand Up @@ -264,50 +265,40 @@ def _layout_cells(self) -> None:
- int(cell["cell_anchor_point"][0] * _measured_width)
)

_horizontal_divider_line = displayio.Shape(
_measured_width + (2 * self.cell_padding),
1,
mirror_x=False,
mirror_y=False,
)

_bottom_divider_tilegrid = displayio.TileGrid(
_horizontal_divider_line,
_bottom_divider_rect = Rectangle(
pixel_shader=palette,
width=_measured_width + (2 * self.cell_padding),
height=1,
y=_bottom_line_loc_y,
x=_bottom_line_loc_x,
)

_top_divider_tilegrid = displayio.TileGrid(
_horizontal_divider_line,
_top_divider_rect = Rectangle(
width=_measured_width + (2 * self.cell_padding),
height=1,
pixel_shader=palette,
y=_top_line_loc_y,
x=_top_line_loc_x,
)

_vertical_divider_line = displayio.Shape(
1,
_measured_height + (2 * self.cell_padding),
mirror_x=False,
mirror_y=False,
)

_left_divider_tilegrid = displayio.TileGrid(
_vertical_divider_line,
_left_divider_rect = Rectangle(
pixel_shader=palette,
width=1,
height=_measured_height + (2 * self.cell_padding),
y=_top_line_loc_y,
x=_top_line_loc_x,
)

_right_divider_tilegrid = displayio.TileGrid(
_vertical_divider_line,
_right_divider_rect = Rectangle(
pixel_shader=palette,
width=1,
height=_measured_height + (2 * self.cell_padding),
y=_right_line_loc_y,
x=_right_line_loc_x,
)

for line_obj in self._divider_lines:
self.remove(line_obj["tilegrid"])
self.remove(line_obj["rect"])

"""
Only use bottom divider lines on the bottom row. All
Expand All @@ -324,8 +315,7 @@ def _layout_cells(self) -> None:
):
self._divider_lines.append(
{
"shape": _horizontal_divider_line,
"tilegrid": _bottom_divider_tilegrid,
"rect": _bottom_divider_rect,
}
)

Expand All @@ -336,8 +326,7 @@ def _layout_cells(self) -> None:
if grid_position_y in self.h_divider_line_rows:
self._divider_lines.append(
{
"shape": _horizontal_divider_line,
"tilegrid": _top_divider_tilegrid,
"rect": _top_divider_rect,
}
)

Expand All @@ -348,8 +337,7 @@ def _layout_cells(self) -> None:
if grid_position_x in self.v_divider_line_cols:
self._divider_lines.append(
{
"shape": _horizontal_divider_line,
"tilegrid": _left_divider_tilegrid,
"rect": _left_divider_rect,
}
)
"""
Expand All @@ -367,13 +355,12 @@ def _layout_cells(self) -> None:
):
self._divider_lines.append(
{
"shape": _vertical_divider_line,
"tilegrid": _right_divider_tilegrid,
"rect": _right_divider_rect,
}
)

for line_obj in self._divider_lines:
self.append(line_obj["tilegrid"])
self.append(line_obj["rect"])

def add_content(
self,
Expand Down