summaryrefslogtreecommitdiff
path: root/shared-module/displayio/Group.c
diff options
context:
space:
mode:
authorJeff Epler <jeff@adafruit.com>2021-03-15 13:50:49 -0500
committerGitHub <noreply@github.com>2021-03-15 13:50:49 -0500
commit05ed179e11599dd45a76dfb14ecf624d0ff96d68 (patch)
treea046c6d1f117814168150484ed1bf7840d3400d7 /shared-module/displayio/Group.c
parent3cbff45f9aac5ea2855bbc888083d356a91c80fe (diff)
parentf9b4189b4c640823dabb76de8effd2a836da2eb0 (diff)
Merge pull request #4362 from microDev1/code-formatting
Add code formatting and translations check
Diffstat (limited to 'shared-module/displayio/Group.c')
-rw-r--r--shared-module/displayio/Group.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
index a36acc1c3..c50f034bf 100644
--- a/shared-module/displayio/Group.c
+++ b/shared-module/displayio/Group.c
@@ -35,16 +35,16 @@
#endif
-void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t scale, mp_int_t x, mp_int_t y) {
+void common_hal_displayio_group_construct(displayio_group_t *self, uint32_t scale, mp_int_t x, mp_int_t y) {
mp_obj_list_t *members = mp_obj_new_list(0, NULL);
displayio_group_construct(self, members, scale, x, y);
}
-bool common_hal_displayio_group_get_hidden(displayio_group_t* self) {
+bool common_hal_displayio_group_get_hidden(displayio_group_t *self) {
return self->hidden;
}
-void common_hal_displayio_group_set_hidden(displayio_group_t* self, bool hidden) {
+void common_hal_displayio_group_set_hidden(displayio_group_t *self, bool hidden) {
if (self->hidden == hidden) {
return;
}
@@ -95,11 +95,11 @@ void displayio_group_set_hidden_by_parent(displayio_group_t *self, bool hidden)
}
}
-uint32_t common_hal_displayio_group_get_scale(displayio_group_t* self) {
+uint32_t common_hal_displayio_group_get_scale(displayio_group_t *self) {
return self->scale;
}
-bool displayio_group_get_previous_area(displayio_group_t *self, displayio_area_t* area) {
+bool displayio_group_get_previous_area(displayio_group_t *self, displayio_area_t *area) {
bool first = true;
for (size_t i = 0; i < self->members->len; i++) {
mp_obj_t layer;
@@ -137,20 +137,20 @@ bool displayio_group_get_previous_area(displayio_group_t *self, displayio_area_t
return !first;
}
-static void _update_child_transforms(displayio_group_t* self) {
+static void _update_child_transforms(displayio_group_t *self) {
if (!self->in_group) {
return;
}
for (size_t i = 0; i < self->members->len; i++) {
mp_obj_t layer;
-#if CIRCUITPY_VECTORIO
+ #if CIRCUITPY_VECTORIO
layer = mp_instance_cast_to_native_base(
self->members->items[i], &vectorio_vector_shape_type);
if (layer != MP_OBJ_NULL) {
vectorio_vector_shape_update_transform(layer, &self->absolute_transform);
continue;
}
-#endif
+ #endif
layer = mp_instance_cast_to_native_base(
self->members->items[i], &displayio_tilegrid_type);
if (layer != MP_OBJ_NULL) {
@@ -167,7 +167,7 @@ static void _update_child_transforms(displayio_group_t* self) {
}
void displayio_group_update_transform(displayio_group_t *self,
- const displayio_buffer_transform_t* parent_transform) {
+ const displayio_buffer_transform_t *parent_transform) {
self->in_group = parent_transform != NULL;
if (self->in_group) {
int16_t x = self->x;
@@ -189,7 +189,7 @@ void displayio_group_update_transform(displayio_group_t *self,
_update_child_transforms(self);
}
-void common_hal_displayio_group_set_scale(displayio_group_t* self, uint32_t scale) {
+void common_hal_displayio_group_set_scale(displayio_group_t *self, uint32_t scale) {
if (self->scale == scale) {
return;
}
@@ -201,18 +201,18 @@ void common_hal_displayio_group_set_scale(displayio_group_t* self, uint32_t scal
_update_child_transforms(self);
}
-mp_int_t common_hal_displayio_group_get_x(displayio_group_t* self) {
+mp_int_t common_hal_displayio_group_get_x(displayio_group_t *self) {
return self->x;
}
-void common_hal_displayio_group_set_x(displayio_group_t* self, mp_int_t x) {
+void common_hal_displayio_group_set_x(displayio_group_t *self, mp_int_t x) {
if (self->x == x) {
return;
}
if (self->absolute_transform.transpose_xy) {
int16_t dy = self->absolute_transform.dy / self->scale;
self->absolute_transform.y += dy * (x - self->x);
- } else {
+ } else {
int16_t dx = self->absolute_transform.dx / self->scale;
self->absolute_transform.x += dx * (x - self->x);
}
@@ -221,18 +221,18 @@ void common_hal_displayio_group_set_x(displayio_group_t* self, mp_int_t x) {
_update_child_transforms(self);
}
-mp_int_t common_hal_displayio_group_get_y(displayio_group_t* self) {
+mp_int_t common_hal_displayio_group_get_y(displayio_group_t *self) {
return self->y;
}
-void common_hal_displayio_group_set_y(displayio_group_t* self, mp_int_t y) {
+void common_hal_displayio_group_set_y(displayio_group_t *self, mp_int_t y) {
if (self->y == y) {
return;
}
if (self->absolute_transform.transpose_xy) {
int8_t dx = self->absolute_transform.dx / self->scale;
self->absolute_transform.x += dx * (y - self->y);
- } else {
+ } else {
int8_t dy = self->absolute_transform.dy / self->scale;
self->absolute_transform.y += dy * (y - self->y);
}
@@ -240,18 +240,18 @@ void common_hal_displayio_group_set_y(displayio_group_t* self, mp_int_t y) {
_update_child_transforms(self);
}
-static void _add_layer(displayio_group_t* self, mp_obj_t layer) {
+static void _add_layer(displayio_group_t *self, mp_obj_t layer) {
mp_obj_t native_layer;
-#if CIRCUITPY_VECTORIO
+ #if CIRCUITPY_VECTORIO
native_layer = mp_instance_cast_to_native_base(layer, &vectorio_vector_shape_type);
if (native_layer != MP_OBJ_NULL) {
vectorio_vector_shape_update_transform(native_layer, &self->absolute_transform);
return;
}
-#endif
+ #endif
native_layer = mp_instance_cast_to_native_base(layer, &displayio_tilegrid_type);
if (native_layer != MP_OBJ_NULL) {
- displayio_tilegrid_t* tilegrid = native_layer;
+ displayio_tilegrid_t *tilegrid = native_layer;
if (tilegrid->in_group) {
mp_raise_ValueError(translate("Layer already in a group."));
} else {
@@ -262,7 +262,7 @@ static void _add_layer(displayio_group_t* self, mp_obj_t layer) {
}
native_layer = mp_instance_cast_to_native_base(layer, &displayio_group_type);
if (native_layer != MP_OBJ_NULL) {
- displayio_group_t* group = native_layer;
+ displayio_group_t *group = native_layer;
if (group->in_group) {
mp_raise_ValueError(translate("Layer already in a group."));
} else {
@@ -274,11 +274,11 @@ static void _add_layer(displayio_group_t* self, mp_obj_t layer) {
mp_raise_ValueError(translate("Layer must be a Group or TileGrid subclass."));
}
-static void _remove_layer(displayio_group_t* self, size_t index) {
+static void _remove_layer(displayio_group_t *self, size_t index) {
mp_obj_t layer;
displayio_area_t layer_area;
bool rendered_last_frame = false;
-#if CIRCUITPY_VECTORIO
+ #if CIRCUITPY_VECTORIO
layer = mp_instance_cast_to_native_base(
self->members->items[index], &vectorio_vector_shape_type);
if (layer != MP_OBJ_NULL) {
@@ -286,18 +286,18 @@ static void _remove_layer(displayio_group_t* self, size_t index) {
rendered_last_frame = has_dirty_area;
vectorio_vector_shape_update_transform(layer, NULL);
}
-#endif
+ #endif
layer = mp_instance_cast_to_native_base(
self->members->items[index], &displayio_tilegrid_type);
if (layer != MP_OBJ_NULL) {
- displayio_tilegrid_t* tilegrid = layer;
+ displayio_tilegrid_t *tilegrid = layer;
rendered_last_frame = displayio_tilegrid_get_previous_area(tilegrid, &layer_area);
displayio_tilegrid_update_transform(tilegrid, NULL);
}
layer = mp_instance_cast_to_native_base(
self->members->items[index], &displayio_group_type);
if (layer != MP_OBJ_NULL) {
- displayio_group_t* group = layer;
+ displayio_group_t *group = layer;
rendered_last_frame = displayio_group_get_previous_area(group, &layer_area);
displayio_group_update_transform(group, NULL);
}
@@ -312,38 +312,38 @@ static void _remove_layer(displayio_group_t* self, size_t index) {
self->item_removed = true;
}
-void common_hal_displayio_group_insert(displayio_group_t* self, size_t index, mp_obj_t layer) {
+void common_hal_displayio_group_insert(displayio_group_t *self, size_t index, mp_obj_t layer) {
_add_layer(self, layer);
mp_obj_list_insert(self->members, index, layer);
}
-mp_obj_t common_hal_displayio_group_pop(displayio_group_t* self, size_t index) {
+mp_obj_t common_hal_displayio_group_pop(displayio_group_t *self, size_t index) {
_remove_layer(self, index);
return mp_obj_list_pop(self->members, index);
}
-mp_int_t common_hal_displayio_group_index(displayio_group_t* self, mp_obj_t layer) {
+mp_int_t common_hal_displayio_group_index(displayio_group_t *self, mp_obj_t layer) {
mp_obj_t args[] = {self->members, layer};
mp_obj_t *index = mp_seq_index_obj(
self->members->items, self->members->len, 2, args);
return MP_OBJ_SMALL_INT_VALUE(index);
}
-size_t common_hal_displayio_group_get_len(displayio_group_t* self) {
+size_t common_hal_displayio_group_get_len(displayio_group_t *self) {
return self->members->len;
}
-mp_obj_t common_hal_displayio_group_get(displayio_group_t* self, size_t index) {
+mp_obj_t common_hal_displayio_group_get(displayio_group_t *self, size_t index) {
return self->members->items[index];
}
-void common_hal_displayio_group_set(displayio_group_t* self, size_t index, mp_obj_t layer) {
+void common_hal_displayio_group_set(displayio_group_t *self, size_t index, mp_obj_t layer) {
_add_layer(self, layer);
_remove_layer(self, index);
mp_obj_list_store(self->members, MP_OBJ_NEW_SMALL_INT(index), layer);
}
-void displayio_group_construct(displayio_group_t* self, mp_obj_list_t* members, uint32_t scale, mp_int_t x, mp_int_t y) {
+void displayio_group_construct(displayio_group_t *self, mp_obj_list_t *members, uint32_t scale, mp_int_t x, mp_int_t y) {
self->x = x;
self->y = y;
self->members = members;
@@ -352,12 +352,12 @@ void displayio_group_construct(displayio_group_t* self, mp_obj_list_t* members,
self->in_group = false;
}
-bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorspace_t* colorspace, const displayio_area_t* area, uint32_t* mask, uint32_t* buffer) {
+bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorspace_t *colorspace, const displayio_area_t *area, uint32_t *mask, uint32_t *buffer) {
// Track if any of the layers finishes filling in the given area. We can ignore any remaining
// layers at that point.
- for (int32_t i = self->members->len - 1; i >= 0 ; i--) {
+ for (int32_t i = self->members->len - 1; i >= 0; i--) {
mp_obj_t layer;
-#if CIRCUITPY_VECTORIO
+ #if CIRCUITPY_VECTORIO
layer = mp_instance_cast_to_native_base(
self->members->items[i], &vectorio_vector_shape_type);
if (layer != MP_OBJ_NULL) {
@@ -366,7 +366,7 @@ bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorsp
}
continue;
}
-#endif
+ #endif
layer = mp_instance_cast_to_native_base(
self->members->items[i], &displayio_tilegrid_type);
if (layer != MP_OBJ_NULL) {
@@ -389,16 +389,16 @@ bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorsp
void displayio_group_finish_refresh(displayio_group_t *self) {
self->item_removed = false;
- for (int32_t i = self->members->len - 1; i >= 0 ; i--) {
+ for (int32_t i = self->members->len - 1; i >= 0; i--) {
mp_obj_t layer;
-#if CIRCUITPY_VECTORIO
+ #if CIRCUITPY_VECTORIO
layer = mp_instance_cast_to_native_base(
self->members->items[i], &vectorio_vector_shape_type);
if (layer != MP_OBJ_NULL) {
vectorio_vector_shape_finish_refresh(layer);
continue;
}
-#endif
+ #endif
layer = mp_instance_cast_to_native_base(
self->members->items[i], &displayio_tilegrid_type);
if (layer != MP_OBJ_NULL) {
@@ -414,22 +414,22 @@ void displayio_group_finish_refresh(displayio_group_t *self) {
}
}
-displayio_area_t* displayio_group_get_refresh_areas(displayio_group_t *self, displayio_area_t* tail) {
+displayio_area_t *displayio_group_get_refresh_areas(displayio_group_t *self, displayio_area_t *tail) {
if (self->item_removed) {
self->dirty_area.next = tail;
tail = &self->dirty_area;
}
- for (int32_t i = self->members->len - 1; i >= 0 ; i--) {
+ for (int32_t i = self->members->len - 1; i >= 0; i--) {
mp_obj_t layer;
-#if CIRCUITPY_VECTORIO
+ #if CIRCUITPY_VECTORIO
layer = mp_instance_cast_to_native_base(
self->members->items[i], &vectorio_vector_shape_type);
if (layer != MP_OBJ_NULL) {
tail = vectorio_vector_shape_get_refresh_areas(layer, tail);
continue;
}
-#endif
+ #endif
layer = mp_instance_cast_to_native_base(
self->members->items[i], &displayio_tilegrid_type);
if (layer != MP_OBJ_NULL) {