Remove max_size from displayio.Group

deshipu · deshipu · commit 38fb7b511b78 · 2021-02-27T20:52:38.000+01:00
Still accept it as an argument. Add deprecation note.
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
@@ -42,7 +42,7 @@
 //|         """Create a Group of a given size and scale. Scale is in one dimension. For example, scale=2
 //|         leads to a layer's pixel being 2x2 pixels when in the group.
 //|
-//|         :param int max_size: The maximum group size.
+//|         :param int max_size: Ignored. Will be removed in 7.x.
 //|         :param int scale: Scale of layer pixels in one dimension.
 //|         :param int x: Initial x position within the parent.
 //|         :param int y: Initial y position within the parent."""
@@ -59,19 +59,14 @@ STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    mp_int_t max_size = args[ARG_max_size].u_int;
-    if (max_size < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_size);
-    }
-
     mp_int_t scale = args[ARG_scale].u_int;
     if (scale < 1) {
         mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_scale);
     }
 
     displayio_group_t *self = m_new_obj(displayio_group_t);
     self->base.type = &displayio_group_type;
-    common_hal_displayio_group_construct(self, max_size, scale, args[ARG_x].u_int, args[ARG_y].u_int);
+    common_hal_displayio_group_construct(self, scale, args[ARG_x].u_int, args[ARG_y].u_int);
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/shared-bindings/displayio/Group.h b/shared-bindings/displayio/Group.h
@@ -33,7 +33,7 @@ extern const mp_obj_type_t displayio_group_type;
 
 displayio_group_t* native_group(mp_obj_t group_obj);
 
-void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t max_size, 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);
 uint32_t common_hal_displayio_group_get_scale(displayio_group_t* self);
 void common_hal_displayio_group_set_scale(displayio_group_t* self, uint32_t scale);
 bool common_hal_displayio_group_get_hidden(displayio_group_t* self);
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
@@ -35,7 +35,7 @@
 #endif
 
 
-void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t max_size, 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`#endif`
`36`	`36`
`37`	`37`
`38`		`-void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t max_size, uint32_t scale, mp_int_t x, mp_int_t y) {`
	`38`	`+void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t scale, mp_int_t x, mp_int_t y) {`
`39`	`39`	`mp_obj_list_t *members = mp_obj_new_list(0, NULL);`
`40`	`40`	`displayio_group_construct(self, members, scale, x, y);`
`41`	`41`	`}`