diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-02 00:10:18 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-02 00:10:18 +0000 |
| commit | 1c9fc6cb19e21749c86389b13196075b97deab73 (patch) | |
| tree | 4aacb792803b62ddde00446077daf71a0ec0c027 /NxWidgets/nxwm/src/glyph_minimize.cxx | |
| parent | f1310686dead78d5bbfecba31ee10bc2ec5d3bc3 (diff) | |
| download | px4-nuttx-1c9fc6cb19e21749c86389b13196075b97deab73.tar.gz px4-nuttx-1c9fc6cb19e21749c86389b13196075b97deab73.tar.bz2 px4-nuttx-1c9fc6cb19e21749c86389b13196075b97deab73.zip | |
NxWM update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4686 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/src/glyph_minimize.cxx')
| -rw-r--r-- | NxWidgets/nxwm/src/glyph_minimize.cxx | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx index f86015367..350f188f9 100644 --- a/NxWidgets/nxwm/src/glyph_minimize.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize.cxx @@ -47,8 +47,9 @@ #include <nuttx/fb.h> #include <nuttx/rgbcolors.h> -#include "nxconfig.hxx" #include "crlepalettebitmap.hxx" + +#include "nxwmconfig.hxx" #include "nxwmglyphs.hxx" /******************************************************************************************** @@ -71,10 +72,10 @@ using namespace NxWM; static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] = { - 0xffffff, 0x2449b6, 0x24496d, 0x244992, 0x242492, 0x496ddb, 0x0024db, 0x0024b6, /* Codes 0-7 */ - 0x002492, 0x0000b6, 0x2424b6, 0x0024ff, 0x0000db, 0x4949db, 0x496db6, 0x246db6, /* Codes 8-15 */ - 0x4949b6, 0x2449db, 0xb6dbff, 0xb6b6db, 0xdbdbff, 0xdbffff, 0x496dff, 0x246dff, /* Codes 16-23 */ - 0x4949ff /* Codes 24-24 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* 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 */ }; /* RGB16 (565) Colors (four of the colors in this map are duplicates) */ @@ -83,9 +84,10 @@ static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] = static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] = { - 0xffff, 0x2256, 0x224d, 0x2252, 0x2132, 0x4b7b, 0x013b, 0x0136, 0x0132, 0x0016, /* Codes 0-9 */ - 0x2136, 0x013f, 0x001b, 0x4a5b, 0x4b76, 0x2376, 0x4a56, 0x225b, 0xb6df, 0xb5bb, /* Codes 10-19 */ - 0xdedf, 0xdfff, 0x4b7f, 0x237f, 0x4a5f /* Codes 20-24 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* 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 */ }; /* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used @@ -102,8 +104,9 @@ static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] = static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] = { - 0xff, 0x4a, 0x42, 0x46, 0x30, 0x6e, 0x2e, 0x29, 0x25, 0x14, 0x34, 0x32, 0x18, 0x59, 0x6a, 0x5f, /* Codes 0-15 */ - 0x55, 0x4e, 0xd4, 0xba, 0xdf, 0xf4, 0x72, 0x67, 0x5d /* Codes 16-24 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* 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 */ }; # else /* CONFIG_NXWIDGETS_GREYSCALE */ @@ -112,8 +115,9 @@ static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_minimizeLut[BITMAP_NLUTCODES] = { - 0xff, 0x2a, 0x29, 0x2a, 0x26, 0x4f, 0x07, 0x06, 0x06, 0x02, 0x26, 0x07, 0x03, 0x4b, 0x4e, 0x2e, /* Codes 0-15 */ - 0x4a, 0x2b, 0xbb, 0xb7, 0xdb, 0xdf, 0x4f, 0x2f, 0x4b /* Codes 16-24 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* 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 */ }; # endif |