diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-13 15:58:12 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-13 15:58:12 -0600 |
commit | 96c93d6499f93ac4baf0d892c3c3c6aaef8a11f9 (patch) | |
tree | 9fdb0554ae5db083c528d86a5189074a9d671cb9 /NxWidgets/nxwm/src | |
parent | 9ae67a1db67f78aff7417d96e3e2a9a4871f515f (diff) | |
download | nuttx-96c93d6499f93ac4baf0d892c3c3c6aaef8a11f9.tar.gz nuttx-96c93d6499f93ac4baf0d892c3c3c6aaef8a11f9.tar.bz2 nuttx-96c93d6499f93ac4baf0d892c3c3c6aaef8a11f9.zip |
NxWM: Can now configure to use small or large icons
Diffstat (limited to 'NxWidgets/nxwm/src')
-rw-r--r-- | NxWidgets/nxwm/src/glyph_calibration48x42.cxx | 20 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/glyph_minimize42x42.cxx | 26 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/glyph_stop42x42.cxx | 16 |
3 files changed, 31 insertions, 31 deletions
diff --git a/NxWidgets/nxwm/src/glyph_calibration48x42.cxx b/NxWidgets/nxwm/src/glyph_calibration48x42.cxx index 7e87f085c..3d6fe04f3 100644 --- a/NxWidgets/nxwm/src/glyph_calibration48x42.cxx +++ b/NxWidgets/nxwm/src/glyph_calibration48x42.cxx @@ -108,7 +108,7 @@ static const uint32_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ - 0x0000, 0xbdf7, 0xad55, 0x8410, 0x39e7, 0xab62, 0x81e2, /* Codes 1-6 */ + 0xbdf7, 0xad55, 0x8410, 0x39e7, 0xab62, 0x81e2 /* Codes 1-6 */ }; static const uint16_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = @@ -301,14 +301,14 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap = { - CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel - CONFIG_NXWIDGETS_FMT, // fmt - Color format - BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels - BITMAP_NROWS, // height - Height in rows - { // lut - Pointer to the beginning of the Look-Up Table (LUT) - g_minimizeNormalLut, // Index 0: Unselected LUT - g_minimizeBrightlLut, // Index 1: Selected LUT + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows + { // lut - Pointer to the beginning of the Look-Up Table (LUT) + g_calibrationNormalLut, // Index 0: Unselected LUT + g_calibrationBrightlLut, // Index 1: Selected LUT }, - g_minimizeRleEntries // data - Pointer to the beginning of the RLE data + g_calibrationRleEntries // data - Pointer to the beginning of the RLE data }; diff --git a/NxWidgets/nxwm/src/glyph_minimize42x42.cxx b/NxWidgets/nxwm/src/glyph_minimize42x42.cxx index 6ba2f23f8..0d207570f 100644 --- a/NxWidgets/nxwm/src/glyph_minimize42x42.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize42x42.cxx @@ -78,7 +78,7 @@ static const uint32_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x1b368a, 0x3651a5, 0x001b8a, 0x001ba5, 0x1b1b6f, 0x00008a, 0xbdbdbd, 0xa5bdbd /* Codes 0-7 */ }; -static const uint32_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const uint32_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x2448b8, 0x486cdc, 0x0024b8, 0x0024dc, 0x242494, 0x0000b8, 0xfcfcfc, 0xdcfcfc /* Codes 0-7 */ }; @@ -90,7 +90,7 @@ static const uint32_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x2448b8, 0x486cdc, 0x0024b8, 0x0024dc, 0x242494, 0x0000b8, 0xfcfcfc, 0xdcfcfc /* Codes 0-7 */ }; -static const uint32_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const uint32_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x2d5ae6, 0x5a87ff, 0x002de6, 0x002dff, 0x2d2db9, 0x0000e6, 0xffffff, 0xffffff /* Codes 0-7 */ }; @@ -106,7 +106,7 @@ static const uint16_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x19b1, 0x3294, 0x00d1, 0x00d4, 0x18cd, 0x0011, 0xbdf7, 0xa5f7 /* Codes 0-7 */ }; -static const uint16_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const uint16_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x2257, 0x4b7b, 0x0137, 0x013b, 0x2132, 0x0017, 0xffff, 0xdfff /* Codes 0-7 */ }; @@ -118,7 +118,7 @@ static const uint16_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x2257, 0x4b7b, 0x0137, 0x013b, 0x2132, 0x0017, 0xffff, 0xdfff /* Codes 0-7 */ }; -static const uint16_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const uint16_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x2adc, 0x5c3f, 0x017c, 0x017f, 0x2977, 0x001c, 0xffff, 0xffff /* Codes 0-7 */ }; @@ -144,7 +144,7 @@ static const uint8_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x37, 0x52, 0x1f, 0x22, 0x24, 0x0f, 0xbd, 0xb5 /* Codes 0-7 */ }; -static const uint8_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const uint8_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x4a, 0x6e, 0x2a, 0x2e, 0x30, 0x14, 0xfc, 0xf2 /* Codes 0-7 */ }; @@ -156,7 +156,7 @@ static const uint8_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x4a, 0x6e, 0x2a, 0x2e, 0x30, 0x14, 0xfc, 0xf2 /* Codes 0-7 */ }; -static const uint8_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const uint8_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x5c, 0x87, 0x34, 0x37, 0x3c, 0x1a, 0xff, 0xff /* Codes 0-7 */ }; @@ -174,7 +174,7 @@ static const nxgl_mxpixel_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x06, 0x2a, 0x02, 0x02, 0x01, 0x02, 0xb6, 0xb6 /* Codes 0-7 */ }; -static const nxgl_mxpixel_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const nxgl_mxpixel_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ }; @@ -186,7 +186,7 @@ static const nxgl_mxpixel_t g_minimizeNormalLut[BITMAP_NLUTCODES] = 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ }; -static const nxgl_mxpixel_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +static const nxgl_mxpixel_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { 0x2b, 0x53, 0x07, 0x07, 0x26, 0x03, 0xff, 0xff /* Codes 0-7 */ }; @@ -249,11 +249,11 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] = const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap = { - CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel - CONFIG_NXWIDGETS_FMT, // fmt - Color format - BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels - BITMAP_NROWS, // height - Height in rows + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_minimizeNormalLut, // Index 0: Unselected LUT g_minimizeBrightLut, // Index 1: Selected LUT diff --git a/NxWidgets/nxwm/src/glyph_stop42x42.cxx b/NxWidgets/nxwm/src/glyph_stop42x42.cxx index 91f7dbe60..0b8ca8fe6 100644 --- a/NxWidgets/nxwm/src/glyph_stop42x42.cxx +++ b/NxWidgets/nxwm/src/glyph_stop42x42.cxx @@ -78,7 +78,7 @@ static const uint32_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xa5a5a5, 0xa50000, 0xbd0000, 0x6f1b1b, 0xbdbdbd, 0xa5bdbd, 0x8a0000, 0xbda5a5 /* Codes 0-7 */ }; -static const uint32_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const uint32_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xdcdcdc, 0xdc0000, 0xfc0000, 0x942424, 0xfcfcfc, 0xdcfcfc, 0xb80000, 0xfcdcdc /* Codes 0-7 */ }; @@ -90,7 +90,7 @@ static const uint32_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xdcdcdc, 0xdc0000, 0xfc0000, 0x942424, 0xfcfcfc, 0xdcfcfc, 0xb80000, 0xfcdcdc /* Codes 0-7 */ }; -static const uint32_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const uint32_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xffffff, 0xff0000, 0xff0000, 0xb92d2d, 0xffffff, 0xffffff, 0xe60000, 0xffffff /* Codes 0-7 */ }; @@ -106,7 +106,7 @@ static const uint16_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xa534, 0xa000, 0xb800, 0x68c3, 0xbdf7, 0xa5f7, 0x8800, 0xbd34 /* Codes 0-7 */ }; -static const uint16_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const uint16_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xdefb, 0xd800, 0xf800, 0x9124, 0xffff, 0xdfff, 0xb800, 0xfefb /* Codes 0-7 */ }; @@ -118,7 +118,7 @@ static const uint16_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xdefb, 0xd800, 0xf800, 0x9124, 0xffff, 0xdfff, 0xb800, 0xfefb /* Codes 0-7 */ }; -static const uint16_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const uint16_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xffff, 0xf800, 0xf800, 0xb965, 0xffff, 0xffff, 0xe000, 0xffff /* Codes 0-7 */ }; @@ -144,7 +144,7 @@ static const uint8_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xa5, 0x31, 0x38, 0x34, 0xbd, 0xb5, 0x29, 0xac /* Codes 0-7 */ }; -static const uint8_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const uint8_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xdc, 0x41, 0x4b, 0x45, 0xfc, 0xf2, 0x37, 0xe5 /* Codes 0-7 */ }; @@ -156,7 +156,7 @@ static const uint8_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xdc, 0x41, 0x4b, 0x45, 0xfc, 0xf2, 0x37, 0xe5 /* Codes 0-7 */ }; -static const uint8_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const uint8_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xff, 0x4c, 0x4c, 0x56, 0xff, 0xff, 0x44, 0xff /* Codes 0-7 */ }; @@ -174,7 +174,7 @@ static const nxgl_mxpixel_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xb6, 0xa0, 0xa0, 0x60, 0xb6, 0xb6, 0x80, 0xb6 /* Codes 0-7 */ }; -static const nxgl_mxpixel_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const nxgl_mxpixel_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xdb, 0xc0, 0xe0, 0x84, 0xff, 0xdf, 0xa0, 0xfb /* Codes 0-7 */ }; @@ -186,7 +186,7 @@ static const nxgl_mxpixel_t g_stopNormalLut[BITMAP_NLUTCODES] = 0xdb, 0xc0, 0xe0, 0x84, 0xff, 0xdf, 0xa0, 0xfb /* Codes 0-7 */ }; -static const nxgl_mxpixel_t g_stopBrightlLut[BITMAP_NLUTCODES] = +static const nxgl_mxpixel_t g_stopBrightLut[BITMAP_NLUTCODES] = { 0xff, 0xe0, 0xe0, 0xa4, 0xff, 0xff, 0xe0, 0xff /* Codes 0-7 */ }; |