diff options
Diffstat (limited to 'NxWidgets/nxwm/src/glyph_minimize.cxx')
| -rw-r--r-- | NxWidgets/nxwm/src/glyph_minimize.cxx | 86 |
1 files changed, 28 insertions, 58 deletions
diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx index 1029ec0b3..1f375ab13 100644 --- a/NxWidgets/nxwm/src/glyph_minimize.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize.cxx @@ -56,9 +56,9 @@ * Pre-Processor Definitions ********************************************************************************************/ -#define BITMAP_NROWS 25 -#define BITMAP_NCOLUMNS 25 -#define BITMAP_NLUTCODES 25 +#define BITMAP_NROWS 21 +#define BITMAP_NCOLUMNS 21 +#define BITMAP_NLUTCODES 8 /******************************************************************************************** * Private Bitmap Data @@ -72,10 +72,7 @@ using namespace NxWM; static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] = { - CONFIG_NXTK_BORDERCOLOR1, /* Code 9 */ - 0x2449b6, 0x24496d, 0x244992, 0x242492, 0x496ddb, 0x0024db, 0x0024b6, 0x002492, /* Codes 1-8 */ - 0x0000b6, 0x2424b6, 0x0024ff, 0x0000db, 0x4949db, 0x496db6, 0x246db6, 0x4949b6, /* Codes 9-17 */ - 0x2449db, 0xb6dbff, 0xb6b6db, 0xdbdbff, 0xdbffff, 0x496dff, 0x246dff, 0x4949ff /* Codes 17-24 */ + 0x2448b4, 0x486cd8, 0x0024b4, 0x0024d8, 0x242490, 0x0000b4, 0xfcfcfc, 0xd8fcfc /* Codes 0-7 */ }; /* RGB16 (565) Colors (four of the colors in this map are duplicates) */ @@ -84,10 +81,7 @@ static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] = static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] = { - CONFIG_NXTK_BORDERCOLOR1, /* Code 0 */ - 0x2256, 0x224d, 0x2252, 0x2132, 0x4b7b, 0x013b, 0x0136, 0x0132, 0x0016, 0x2136, /* Codes 1-10 */ - 0x013f, 0x001b, 0x4a5b, 0x4b76, 0x2376, 0x4a56, 0x225b, 0xb6df, 0xb5bb, 0xdedf, /* Codes 11-20 */ - 0xdfff, 0x4b7f, 0x237f, 0x4a5f /* Codes 21-24 */ + 0x2256, 0x4b7b, 0x0136, 0x013b, 0x2132, 0x0016, 0xffff, 0xdfff /* Codes 0-7 */ }; /* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used @@ -104,9 +98,7 @@ static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] = static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] = { - CONFIG_NXTK_BORDERCOLOR1, /* Code 0 */ - 0x4a, 0x42, 0x46, 0x30, 0x6e, 0x2e, 0x29, 0x25, 0x14, 0x34, 0x32, 0x18, 0x59, /* Codes 1-13 */ - 0x6a, 0x5f, 0x55, 0x4e, 0xd4, 0xba, 0xdf, 0xf4, 0x72, 0x67, 0x5d /* Codes 14-24 */ + 0x49, 0x6d, 0x29, 0x2d, 0x30, 0x14, 0xfc, 0xf1 /* Codes 0-7 */ }; # else /* CONFIG_NXWIDGETS_GREYSCALE */ @@ -115,9 +107,7 @@ static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_minimizeLut[BITMAP_NLUTCODES] = { - CONFIG_NXTK_BORDERCOLOR1, /* Code 0 */ - 0x2a, 0x29, 0x2a, 0x26, 0x4f, 0x07, 0x06, 0x06, 0x02, 0x26, 0x07, 0x03, 0x4b, /* Codes 1-13 */ - 0x4e, 0x2e, 0x4a, 0x2b, 0xbb, 0xb7, 0xdb, 0xdf, 0x4f, 0x2f, 0x4b /* Codes 14-24 */ + 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ }; # endif @@ -127,47 +117,27 @@ static const nxgl_mxpixel_t g_minimizeLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] = { - { 25, 0}, /* Row 0 */ - { 25, 0}, /* Row 1 */ - { 2, 0}, { 1, 1}, { 3, 2}, { 1, 3}, { 1, 4}, { 3, 3}, { 2, 4}, { 4, 3}, /* Row 2 */ - { 1, 4}, { 1, 3}, { 2, 2}, { 1, 1}, { 1, 5}, { 2, 0}, - { 2, 0}, { 1, 2}, { 3, 6}, { 8, 7}, { 2, 8}, { 3, 7}, { 2, 8}, { 1, 4}, /* Row 3 */ - { 1, 1}, { 2, 0}, - { 2, 0}, { 1, 4}, { 11, 6}, { 3, 7}, { 1, 6}, { 4, 7}, { 1, 2}, { 2, 0}, /* Row 4 */ - { 2, 0}, { 1, 7}, { 11, 6}, { 3, 7}, { 1, 6}, { 4, 7}, { 1, 3}, { 2, 0}, /* Row 5 */ - { 2, 0}, { 1, 4}, { 9, 6}, { 10, 7}, { 1, 1}, { 2, 0}, /* Row 6 */ - { 2, 0}, { 1, 4}, { 9, 6}, { 2, 7}, { 1, 8}, { 7, 7}, { 1, 1}, { 2, 0}, /* Row 7 */ - { 2, 0}, { 1, 4}, { 8, 6}, { 4, 7}, { 1, 8}, { 6, 7}, { 1, 1}, { 2, 0}, /* Row 8 */ - { 2, 0}, { 1, 4}, { 9, 6}, { 8, 7}, { 1, 9}, { 1, 7}, { 1, 1}, { 2, 0}, /* Row 9 */ - { 2, 0}, { 1, 10}, { 9, 6}, { 1, 7}, { 1, 6}, { 6, 7}, { 1, 9}, { 1, 7}, /* Row 10 */ - { 1, 1}, { 2, 0}, - { 2, 0}, { 1, 10}, { 7, 6}, { 1, 7}, { 2, 6}, { 6, 7}, { 2, 9}, { 1, 7}, /* Row 11 */ - { 1, 10}, { 2, 0}, - { 2, 0}, { 1, 10}, { 6, 6}, { 3, 7}, { 1, 6}, { 6, 7}, { 3, 9}, { 1, 10}, /* Row 12 */ - { 2, 0}, - { 2, 0}, { 1, 10}, { 4, 6}, { 8, 7}, { 3, 9}, { 1, 7}, { 3, 9}, { 1, 10}, /* Row 13 */ - { 2, 0}, - { 2, 0}, { 1, 4}, { 1, 7}, { 1, 6}, { 1, 7}, { 2, 6}, { 2, 7}, { 3, 9}, /* Row 14 */ - { 1, 7}, { 6, 9}, { 1, 7}, { 1, 9}, { 1, 4}, { 2, 0}, - { 2, 0}, { 1, 10}, { 2, 6}, { 1, 7}, { 1, 6}, { 3, 7}, { 2, 9}, { 1, 7}, /* Row 15 */ - { 6, 9}, { 1, 7}, { 1, 6}, { 1, 9}, { 1, 10}, { 2, 0}, - { 2, 0}, { 1, 10}, { 1, 11}, { 2, 6}, { 5, 7}, { 1, 6}, { 3, 7}, { 3, 9}, /* Row 16 */ - { 2, 7}, { 2, 9}, { 1, 10}, { 2, 0}, - { 2, 0}, { 1, 10}, { 3, 11}, { 5, 6}, { 3, 9}, { 5, 7}, { 1, 6}, { 1, 7}, /* Row 17 */ - { 1, 9}, { 1, 10}, { 2, 0}, - { 2, 0}, { 1, 10}, { 1, 6}, { 1, 12}, { 1, 13}, { 1, 14}, { 1, 1}, { 2, 15}, /* Row 18 */ - { 1, 1}, { 1, 14}, { 2, 16}, { 3, 14}, { 1, 1}, { 1, 15}, { 1, 17}, { 2, 9}, - { 1, 4}, { 2, 0}, - { 2, 0}, { 1, 4}, { 2, 10}, { 1, 18}, { 13, 0}, { 1, 18}, { 1, 10}, { 1, 4}, /* Row 19 */ - { 1, 2}, { 2, 0}, - { 2, 0}, { 1, 4}, { 1, 10}, { 1, 9}, { 1, 19}, { 3, 20}, { 2, 21}, { 7, 20}, /* Row 20 */ - { 1, 21}, { 1, 18}, { 1, 13}, { 1, 4}, { 1, 2}, { 2, 0}, - { 2, 0}, { 1, 1}, { 3, 6}, { 1, 17}, { 2, 22}, { 1, 5}, { 1, 23}, { 2, 22}, /* Row 21 */ - { 3, 5}, { 2, 22}, { 1, 5}, { 1, 22}, { 1, 24}, { 1, 7}, { 1, 1}, { 2, 0}, - { 2, 0}, { 1, 5}, { 1, 1}, { 1, 6}, { 1, 7}, { 2, 10}, { 3, 7}, { 2, 6}, /* Row 22 */ - { 6, 7}, { 2, 10}, { 1, 1}, { 1, 5}, { 2, 0}, - { 25, 0}, /* Row 23 */ - { 25, 0} /* Row 24 */ + { 1, 0}, { 20, 1}, /* Row 0 */ + { 1, 1}, { 5, 2}, { 5, 3}, { 8, 2}, { 1, 4}, { 1, 0}, /* Row 1 */ + { 1, 1}, { 3, 2}, { 8, 3}, { 8, 2}, { 1, 4}, /* Row 2 */ + { 1, 1}, { 2, 2}, { 10, 3}, { 7, 2}, { 1, 4}, /* Row 3 */ + { 1, 1}, { 1, 2}, { 10, 3}, { 8, 2}, { 1, 4}, /* Row 4 */ + { 1, 1}, { 1, 2}, { 9, 3}, { 9, 2}, { 1, 4}, /* Row 5 */ + { 1, 1}, { 9, 3}, { 9, 2}, { 1, 5}, { 1, 4}, /* Row 6 */ + { 1, 1}, { 8, 3}, { 10, 2}, { 1, 5}, { 1, 4}, /* Row 7 */ + { 1, 1}, { 7, 3}, { 11, 2}, { 1, 5}, { 1, 4}, /* Row 8 */ + { 1, 1}, { 1, 2}, { 4, 3}, { 12, 2}, { 2, 5}, { 1, 4}, /* Row 9 */ + { 1, 1}, { 2, 2}, { 1, 3}, { 14, 2}, { 2, 5}, { 1, 4}, /* Row 10 */ + { 1, 1}, { 16, 2}, { 3, 5}, { 1, 4}, /* Row 11 */ + { 1, 1}, { 15, 2}, { 4, 5}, { 1, 4}, /* Row 12 */ + { 1, 1}, { 13, 2}, { 6, 5}, { 1, 4}, /* Row 13 */ + { 1, 1}, { 11, 2}, { 8, 5}, { 1, 4}, /* Row 14 */ + { 1, 1}, { 8, 2}, { 11, 5}, { 1, 4}, /* Row 15 */ + { 1, 1}, { 4, 2}, { 15, 5}, { 1, 4}, /* Row 16 */ + { 1, 1}, { 2, 2}, { 14, 6}, { 1, 7}, { 2, 5}, { 1, 4}, /* Row 17 */ + { 1, 1}, { 1, 2}, { 1, 5}, { 15, 7}, { 2, 5}, { 1, 4}, /* Row 18 */ + { 1, 1}, { 19, 5}, { 1, 0}, /* Row 19 */ + { 1, 1}, { 1, 0}, { 17, 4}, { 1, 0}, { 1, 1}, /* Row 20 */ }; /******************************************************************************************** |