djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert whitespace change. handle hidden by parent

Browse Source
This commit is contained in:
foamyguy 2023-06-16 16:57:37 -05:00
parent 3222cdf847
commit 074c13488b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared-module/displayio/Group.c
View File

@ -454,7 +454,7 @@ displayio_area_t *displayio_group_get_refresh_areas(displayio_group_t *self, dis
}
#endif
layer = mp_obj_cast_to_native_base(
self->members->items[i], &displayio_tilegrid_type);
self->members->items[i], &displayio_tilegrid_type);
if (layer != MP_OBJ_NULL) {
if (!displayio_tilegrid_get_rendered_hidden(layer)) {
tail = displayio_tilegrid_get_refresh_areas(layer, tail);
@ -462,7 +462,7 @@ displayio_area_t *displayio_group_get_refresh_areas(displayio_group_t *self, dis
continue;
}
layer = mp_obj_cast_to_native_base(
self->members->items[i], &displayio_group_type);
self->members->items[i], &displayio_group_type);
if (layer != MP_OBJ_NULL) {
tail = displayio_group_get_refresh_areas(layer, tail);
continue;

4
shared-module/displayio/TileGrid.c
View File

@ -99,6 +99,8 @@ void displayio_tilegrid_set_hidden_by_parent(displayio_tilegrid_t *self, bool hi
self->hidden_by_parent = hidden;
if (!hidden) {
self->full_change = true;
}else {
self->rendered_hidden = false;
}
}
@ -555,7 +557,6 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self,
}
void displayio_tilegrid_finish_refresh(displayio_tilegrid_t *self) {
bool first_draw = self->previous_area.x1 == self->previous_area.x2;
bool hidden = self->hidden || self->hidden_by_parent;
if (!first_draw && hidden) {
@ -596,7 +597,6 @@ displayio_area_t *displayio_tilegrid_get_refresh_areas(displayio_tilegrid_t *sel
} else {
return tail;
}
} else if (self->moved && !first_draw) {
displayio_area_union(&self->previous_area, &self->current_area, &self->dirty_area);
if (displayio_area_size(&self->dirty_area) <= 2U * self->pixel_width * self->pixel_height) {