Skip to content

Commit 074c134

Browse files
committed
revert whitespace change. handle hidden by parent
1 parent 3222cdf commit 074c134

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

shared-module/displayio/Group.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,15 +454,15 @@ displayio_area_t *displayio_group_get_refresh_areas(displayio_group_t *self, dis
454454
}
455455
#endif
456456
layer = mp_obj_cast_to_native_base(
457-
self->members->items[i], &displayio_tilegrid_type);
457+
self->members->items[i], &displayio_tilegrid_type);
458458
if (layer != MP_OBJ_NULL) {
459459
if (!displayio_tilegrid_get_rendered_hidden(layer)) {
460460
tail = displayio_tilegrid_get_refresh_areas(layer, tail);
461461
}
462462
continue;
463463
}
464464
layer = mp_obj_cast_to_native_base(
465-
self->members->items[i], &displayio_group_type);
465+
self->members->items[i], &displayio_group_type);
466466
if (layer != MP_OBJ_NULL) {
467467
tail = displayio_group_get_refresh_areas(layer, tail);
468468
continue;

shared-module/displayio/TileGrid.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ void displayio_tilegrid_set_hidden_by_parent(displayio_tilegrid_t *self, bool hi
9999
self->hidden_by_parent = hidden;
100100
if (!hidden) {
101101
self->full_change = true;
102+
}else {
103+
self->rendered_hidden = false;
102104
}
103105
}
104106

@@ -555,7 +557,6 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self,
555557
}
556558

557559
void displayio_tilegrid_finish_refresh(displayio_tilegrid_t *self) {
558-
559560
bool first_draw = self->previous_area.x1 == self->previous_area.x2;
560561
bool hidden = self->hidden || self->hidden_by_parent;
561562
if (!first_draw && hidden) {
@@ -596,7 +597,6 @@ displayio_area_t *displayio_tilegrid_get_refresh_areas(displayio_tilegrid_t *sel
596597
} else {
597598
return tail;
598599
}
599-
600600
} else if (self->moved && !first_draw) {
601601
displayio_area_union(&self->previous_area, &self->current_area, &self->dirty_area);
602602
if (displayio_area_size(&self->dirty_area) <= 2U * self->pixel_width * self->pixel_height) {

0 commit comments

Comments
 (0)