Skip to content

Commit 74c07a4

Browse files
jensechujensechu
committed
displayio: Add in opaque pixel option for future
1 parent b02a5bc commit 74c07a4

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-10-14 22:22-0500\n"
11+
"POT-Creation-Date: 2020-10-16 19:50-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3408,10 +3408,6 @@ msgstr ""
34083408
msgid "too many values to unpack (expected %d)"
34093409
msgstr ""
34103410

3411-
#: shared-bindings/displayio/ColorConverter.c
3412-
msgid "transparent_color should be an int"
3413-
msgstr ""
3414-
34153411
#: extmod/ulab/code/approx/approx.c
34163412
msgid "trapz is defined for 1D arrays of equal length"
34173413
msgstr ""

‎shared-bindings/displayio/ColorConverter.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,14 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_transparent_obj, display
125125
//| def make_opaque(self) -> None:
126126
//| """Sets a pixel to opaque."""
127127
//|
128-
STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in) {
128+
STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
129129
displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
130-
common_hal_displayio_colorconverter_make_opaque(self);
130+
131+
mp_int_t transparent_color = mp_obj_get_int(&transparent_color);
132+
common_hal_displayio_colorconverter_make_opaque(self, transparent_color);
131133
return mp_const_none;
132134
}
133-
MP_DEFINE_CONST_FUN_OBJ_1(displayio_colorconverter_make_opaque_obj, displayio_colorconverter_make_opaque);
135+
MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_opaque_obj, displayio_colorconverter_make_opaque);
134136

135137
STATIC const mp_rom_map_elem_t displayio_colorconverter_locals_dict_table[] = {
136138
{ MP_ROM_QSTR(MP_QSTR_convert), MP_ROM_PTR(&displayio_colorconverter_convert_obj) },

‎shared-bindings/displayio/ColorConverter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ void common_hal_displayio_colorconverter_set_dither(displayio_colorconverter_t*
4040
bool common_hal_displayio_colorconverter_get_dither(displayio_colorconverter_t* self);
4141

4242
void common_hal_displayio_colorconverter_make_transparent(displayio_colorconverter_t* self, uint32_t transparent_color);
43-
void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self);
43+
void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self, uint32_t transparent_color);
4444

4545
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_COLORCONVERTER_H

‎shared-module/displayio/ColorConverter.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ void common_hal_displayio_colorconverter_make_transparent(displayio_colorconvert
136136
self->transparent_color = transparent_color;
137137
}
138138

139-
void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self) {
139+
void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self, uint32_t transparent_color) {
140+
(void) transparent_color;
141+
140142
// 0x1000000 will never equal a valid color
141143
self->transparent_color = 0x1000000;
142144
}

0 commit comments

Comments
 (0)