From 39ba566bb0ecb042169a73f36704c28663810003 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 13 Jul 2014 19:36:30 -0600 Subject: NxWM: Slightly improvied minimize icon --- NxWidgets/nxwm/images/minimize42x42.png | Bin 310 -> 420 bytes NxWidgets/nxwm/include/nxwmconfig.hxx | 2 +- NxWidgets/nxwm/src/glyph_minimize42x42.cxx | 120 ++++++++++++++--------------- 3 files changed, 61 insertions(+), 61 deletions(-) (limited to 'NxWidgets') diff --git a/NxWidgets/nxwm/images/minimize42x42.png b/NxWidgets/nxwm/images/minimize42x42.png index 0d6eeb170..2ffb76a2d 100755 Binary files a/NxWidgets/nxwm/images/minimize42x42.png and b/NxWidgets/nxwm/images/minimize42x42.png differ diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index 0f31e8d55..453ab0421 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -189,7 +189,7 @@ * * CONFIG_NXWM_TASKBAR_WIDTH - Task bar thickness (either vertical or * horizontal). Default: 25 + 2*spacing unless large icons are selected. - * Then the default is 50 *spacing + * Then the default is 50 + 2*spacing. */ /** diff --git a/NxWidgets/nxwm/src/glyph_minimize42x42.cxx b/NxWidgets/nxwm/src/glyph_minimize42x42.cxx index 0d207570f..e4d57ad6c 100644 --- a/NxWidgets/nxwm/src/glyph_minimize42x42.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize42x42.cxx @@ -58,7 +58,7 @@ #define BITMAP_NROWS 42 #define BITMAP_NCOLUMNS 42 -#define BITMAP_NLUTCODES 8 +#define BITMAP_NLUTCODES 7 #define DARK_MINIMIZE_ICON 1 @@ -75,24 +75,24 @@ using namespace NxWM; static const uint32_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x1b368a, 0x3651a5, 0x001b8a, 0x001ba5, 0x1b1b6f, 0x00008a, 0xbdbdbd, 0xa5bdbd /* Codes 0-7 */ + 0x6f99b4, 0x001b8a, 0x001ba5, 0x060f4b, 0x00007b, 0xbdbdbd, 0xa5bdbd /* Codes 0-6 */ }; static const uint32_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x2448b8, 0x486cdc, 0x0024b8, 0x0024dc, 0x242494, 0x0000b8, 0xfcfcfc, 0xdcfcfc /* Codes 0-7 */ + 0x94ccf0, 0x0024b8, 0x0024dc, 0x081464, 0x0000a4, 0xfcfcfc, 0xdcfcfc /* Codes 0-6 */ }; # else /* DARK_MINIMIZE_ICON */ static const uint32_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x2448b8, 0x486cdc, 0x0024b8, 0x0024dc, 0x242494, 0x0000b8, 0xfcfcfc, 0xdcfcfc /* Codes 0-7 */ + 0x94ccf0, 0x0024b8, 0x0024dc, 0x081464, 0x0000a4, 0xfcfcfc, 0xdcfcfc /* Codes 0-6 */ }; static const uint32_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x2d5ae6, 0x5a87ff, 0x002de6, 0x002dff, 0x2d2db9, 0x0000e6, 0xffffff, 0xffffff /* Codes 0-7 */ + 0xb9ffff, 0x002de6, 0x002dff, 0x0a197d, 0x0000cd, 0xffffff, 0xffffff /* Codes 0-6 */ }; # endif /* DARK_MINIMIZE_ICON */ @@ -103,24 +103,24 @@ static const uint32_t g_minimizeBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x19b1, 0x3294, 0x00d1, 0x00d4, 0x18cd, 0x0011, 0xbdf7, 0xa5f7 /* Codes 0-7 */ + 0x6cd6, 0x00d1, 0x00d4, 0x0069, 0x000f, 0xbdf7, 0xa5f7 /* Codes 0-6 */ }; static const uint16_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x2257, 0x4b7b, 0x0137, 0x013b, 0x2132, 0x0017, 0xffff, 0xdfff /* Codes 0-7 */ + 0x967e, 0x0137, 0x013b, 0x08ac, 0x0014, 0xffff, 0xdfff /* Codes 0-6 */ }; # else /* DARK_MINIMIZE_ICON */ static const uint16_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x2257, 0x4b7b, 0x0137, 0x013b, 0x2132, 0x0017, 0xffff, 0xdfff /* Codes 0-7 */ + 0x967e, 0x0137, 0x013b, 0x08ac, 0x0014, 0xffff, 0xdfff /* Codes 0-6 */ }; static const uint16_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x2adc, 0x5c3f, 0x017c, 0x017f, 0x2977, 0x001c, 0xffff, 0xffff /* Codes 0-7 */ + 0xbfff, 0x017c, 0x017f, 0x08cf, 0x0019, 0xffff, 0xffff /* Codes 0-6 */ }; # endif /* DARK_MINIMIZE_ICON */ @@ -141,24 +141,24 @@ static const uint16_t g_minimizeBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x37, 0x52, 0x1f, 0x22, 0x24, 0x0f, 0xbd, 0xb5 /* Codes 0-7 */ + 0x8f, 0x1f, 0x22, 0x13, 0x0e, 0xbd, 0xb5 /* Codes 0-6 */ }; static const uint8_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x4a, 0x6e, 0x2a, 0x2e, 0x30, 0x14, 0xfc, 0xf2 /* Codes 0-7 */ + 0xbf, 0x2a, 0x2e, 0x19, 0x12, 0xfc, 0xf2 /* Codes 0-6 */ }; # else /* DARK_MINIMIZE_ICON */ static const uint8_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x4a, 0x6e, 0x2a, 0x2e, 0x30, 0x14, 0xfc, 0xf2 /* Codes 0-7 */ + 0xbf, 0x2a, 0x2e, 0x19, 0x12, 0xfc, 0xf2 /* Codes 0-6 */ }; static const uint8_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x5c, 0x87, 0x34, 0x37, 0x3c, 0x1a, 0xff, 0xff /* Codes 0-7 */ + 0xea, 0x34, 0x37, 0x1f, 0x17, 0xff, 0xff /* Codes 0-6 */ }; # endif /* DARK_MINIMIZE_ICON */ @@ -171,24 +171,24 @@ static const uint8_t g_minimizeBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x06, 0x2a, 0x02, 0x02, 0x01, 0x02, 0xb6, 0xb6 /* Codes 0-7 */ + 0x72, 0x02, 0x02, 0x01, 0x01, 0xb6, 0xb6 /* Codes 0-6 */ }; static const nxgl_mxpixel_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ + 0x9b, 0x06, 0x07, 0x01, 0x02, 0xff, 0xdf /* Codes 0-6 */ }; # else /* DARK_MINIMIZE_ICON */ static const nxgl_mxpixel_t g_minimizeNormalLut[BITMAP_NLUTCODES] = { - 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ + 0x9b, 0x06, 0x07, 0x01, 0x02, 0xff, 0xdf /* Codes 0-6 */ }; static const nxgl_mxpixel_t g_minimizeBrightLut[BITMAP_NLUTCODES] = { - 0x2b, 0x53, 0x07, 0x07, 0x26, 0x03, 0xff, 0xff /* Codes 0-7 */ + 0xbf, 0x07, 0x07, 0x01, 0x03, 0xff, 0xff /* Codes 0-6 */ }; # endif /* DARK_MINIMIZE_ICON */ @@ -199,48 +199,48 @@ static const nxgl_mxpixel_t g_minimizeBrightLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] = { - { 2, 0}, {40, 1}, /* Row 0 */ - { 2, 0}, {40, 1}, /* Row 1 */ - { 2, 1}, {10, 2}, {10, 3}, {16, 2}, { 2, 4}, { 2, 0}, /* Row 2 */ - { 2, 1}, {10, 2}, {10, 3}, {16, 2}, { 2, 4}, { 2, 0}, /* Row 3 */ - { 2, 1}, { 6, 2}, {16, 3}, {16, 2}, { 2, 4}, /* Row 4 */ - { 2, 1}, { 6, 2}, {16, 3}, {16, 2}, { 2, 4}, /* Row 5 */ - { 2, 1}, { 4, 2}, {20, 3}, {14, 2}, { 2, 4}, /* Row 6 */ - { 2, 1}, { 4, 2}, {20, 3}, {14, 2}, { 2, 4}, /* Row 7 */ - { 2, 1}, { 2, 2}, {20, 3}, {16, 2}, { 2, 4}, /* Row 8 */ - { 2, 1}, { 2, 2}, {20, 3}, {16, 2}, { 2, 4}, /* Row 9 */ - { 2, 1}, { 2, 2}, {18, 3}, {18, 2}, { 2, 4}, /* Row 10 */ - { 2, 1}, { 2, 2}, {18, 3}, {18, 2}, { 2, 4}, /* Row 11 */ - { 2, 1}, {18, 3}, {18, 2}, { 2, 5}, { 2, 4}, /* Row 12 */ - { 2, 1}, {18, 3}, {18, 2}, { 2, 5}, { 2, 4}, /* Row 13 */ - { 2, 1}, {16, 3}, {20, 2}, { 2, 5}, { 2, 4}, /* Row 14 */ - { 2, 1}, {16, 3}, {20, 2}, { 2, 5}, { 2, 4}, /* Row 15 */ - { 2, 1}, {14, 3}, {22, 2}, { 2, 5}, { 2, 4}, /* Row 16 */ - { 2, 1}, {14, 3}, {22, 2}, { 2, 5}, { 2, 4}, /* Row 17 */ - { 2, 1}, { 2, 2}, { 8, 3}, {24, 2}, { 4, 5}, { 2, 4}, /* Row 18 */ - { 2, 1}, { 2, 2}, { 8, 3}, {24, 2}, { 4, 5}, { 2, 4}, /* Row 19 */ - { 2, 1}, { 4, 2}, { 2, 3}, {28, 2}, { 4, 5}, { 2, 4}, /* Row 20 */ - { 2, 1}, { 4, 2}, { 2, 3}, {28, 2}, { 4, 5}, { 2, 4}, /* Row 21 */ - { 2, 1}, {32, 2}, { 6, 5}, { 2, 4}, /* Row 22 */ - { 2, 1}, {32, 2}, { 6, 5}, { 2, 4}, /* Row 23 */ - { 2, 1}, {30, 2}, { 8, 5}, { 2, 4}, /* Row 24 */ - { 2, 1}, {30, 2}, { 8, 5}, { 2, 4}, /* Row 25 */ - { 2, 1}, {26, 2}, {12, 5}, { 2, 4}, /* Row 26 */ - { 2, 1}, {26, 2}, {12, 5}, { 2, 4}, /* Row 27 */ - { 2, 1}, {22, 2}, {16, 5}, { 2, 4}, /* Row 28 */ - { 2, 1}, {22, 2}, {16, 5}, { 2, 4}, /* Row 29 */ - { 2, 1}, {16, 2}, {22, 5}, { 2, 4}, /* Row 30 */ - { 2, 1}, {16, 2}, {22, 5}, { 2, 4}, /* Row 31 */ - { 2, 1}, { 8, 2}, {30, 5}, { 2, 4}, /* Row 32 */ - { 2, 1}, { 8, 2}, {30, 5}, { 2, 4}, /* Row 33 */ - { 2, 1}, { 4, 2}, {28, 6}, { 2, 7}, { 4, 5}, { 2, 4}, /* Row 34 */ - { 2, 1}, { 4, 2}, {28, 6}, { 2, 7}, { 4, 5}, { 2, 4}, /* Row 35 */ - { 2, 1}, { 2, 2}, { 2, 5}, {30, 7}, { 4, 5}, { 2, 4}, /* Row 36 */ - { 2, 1}, { 2, 2}, { 2, 5}, {30, 7}, { 4, 5}, { 2, 4}, /* Row 37 */ - { 2, 1}, {38, 5}, { 2, 0}, /* Row 38 */ - { 2, 1}, {38, 5}, { 2, 0}, /* Row 39 */ - { 2, 1}, { 2, 0}, {34, 4}, { 2, 0}, { 2, 1}, /* Row 40 */ - { 2, 1}, { 2, 0}, {34, 4}, { 2, 0}, { 2, 1} /* Row 41 */ + {42, 0}, /* Row 0 */ + { 1, 0}, {11, 1}, {10, 2}, {19, 1}, { 1, 0}, /* Row 1 */ + { 1, 0}, { 9, 1}, {14, 2}, {17, 1}, { 1, 3}, /* Row 2 */ + { 1, 0}, { 7, 1}, {17, 2}, {16, 1}, { 1, 3}, /* Row 3 */ + { 1, 0}, { 6, 1}, {18, 2}, {16, 1}, { 1, 3}, /* Row 4 */ + { 1, 0}, { 5, 1}, {19, 2}, {16, 1}, { 1, 3}, /* Row 5 */ + { 1, 0}, { 4, 1}, {20, 2}, {16, 1}, { 1, 3}, /* Row 6 */ + { 1, 0}, { 3, 1}, {20, 2}, {17, 1}, { 1, 3}, /* Row 7 */ + { 1, 0}, { 3, 1}, {20, 2}, {17, 1}, { 1, 3}, /* Row 8 */ + { 1, 0}, { 2, 1}, {20, 2}, {17, 1}, { 1, 4}, { 1, 3}, /* Row 9 */ + { 1, 0}, { 2, 1}, {19, 2}, {18, 1}, { 1, 4}, { 1, 3}, /* Row 10 */ + { 1, 0}, { 1, 1}, {19, 2}, {19, 1}, { 1, 4}, { 1, 3}, /* Row 11 */ + { 1, 0}, { 1, 1}, {18, 2}, {20, 1}, { 1, 4}, { 1, 3}, /* Row 12 */ + { 1, 0}, {18, 2}, {20, 1}, { 2, 4}, { 1, 3}, /* Row 13 */ + { 1, 0}, {17, 2}, {21, 1}, { 2, 4}, { 1, 3}, /* Row 14 */ + { 1, 0}, {15, 2}, {22, 1}, { 3, 4}, { 1, 3}, /* Row 15 */ + { 1, 0}, {14, 2}, {23, 1}, { 3, 4}, { 1, 3}, /* Row 16 */ + { 1, 0}, {12, 2}, {24, 1}, { 4, 4}, { 1, 3}, /* Row 17 */ + { 1, 0}, {10, 2}, {26, 1}, { 4, 4}, { 1, 3}, /* Row 18 */ + { 1, 0}, { 1, 1}, { 8, 2}, {26, 1}, { 5, 4}, { 1, 3}, /* Row 19 */ + { 1, 0}, { 2, 1}, { 5, 2}, {27, 1}, { 6, 4}, { 1, 3}, /* Row 20 */ + { 1, 0}, { 4, 1}, { 1, 2}, {29, 1}, { 6, 4}, { 1, 3}, /* Row 21 */ + { 1, 0}, {33, 1}, { 7, 4}, { 1, 3}, /* Row 22 */ + { 1, 0}, {32, 1}, { 8, 4}, { 1, 3}, /* Row 23 */ + { 1, 0}, {31, 1}, { 9, 4}, { 1, 3}, /* Row 24 */ + { 1, 0}, {30, 1}, {10, 4}, { 1, 3}, /* Row 25 */ + { 1, 0}, {29, 1}, {11, 4}, { 1, 3}, /* Row 26 */ + { 1, 0}, {28, 1}, {12, 4}, { 1, 3}, /* Row 27 */ + { 1, 0}, {27, 1}, {13, 4}, { 1, 3}, /* Row 28 */ + { 1, 0}, {26, 1}, {14, 4}, { 1, 3}, /* Row 29 */ + { 1, 0}, {24, 1}, {16, 4}, { 1, 3}, /* Row 30 */ + { 1, 0}, {22, 1}, {18, 4}, { 1, 3}, /* Row 31 */ + { 1, 0}, { 6, 1}, {28, 5}, { 6, 4}, { 1, 3}, /* Row 32 */ + { 1, 0}, { 5, 1}, {29, 5}, { 1, 6}, { 5, 4}, { 1, 3}, /* Row 33 */ + { 1, 0}, { 5, 1}, {29, 5}, { 1, 6}, { 5, 4}, { 1, 3}, /* Row 34 */ + { 1, 0}, { 5, 1}, {29, 5}, { 1, 6}, { 5, 4}, { 1, 3}, /* Row 35 */ + { 1, 0}, { 5, 1}, {29, 5}, { 1, 6}, { 5, 4}, { 1, 3}, /* Row 36 */ + { 1, 0}, { 6, 1}, {28, 6}, { 6, 4}, { 1, 3}, /* Row 37 */ + { 1, 0}, { 4, 1}, {36, 4}, { 1, 3}, /* Row 38 */ + { 1, 0}, { 2, 1}, {38, 4}, { 1, 3}, /* Row 39 */ + { 1, 0}, {40, 4}, { 1, 3}, /* Row 40 */ + { 2, 0}, {40, 3} /* Row 41 */ }; /******************************************************************************************** @@ -258,5 +258,5 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap = g_minimizeNormalLut, // Index 0: Unselected LUT g_minimizeBrightLut, // Index 1: Selected LUT }, - g_minimizeRleEntries // data - Pointer to the beginning of the RLE data + g_minimizeRleEntries // data - Pointer to the beginning of the RLE data }; -- cgit v1.2.3