sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/graphics/nxglyphs: Add a new resize cursor image. apps/graphics/twm4nx: Use new resize cursor image.

Browse Source
This commit is contained in:
Gregory Nutt 2019-05-17 10:52:16 -06:00
parent 5c8249f584
commit d237001bc3
10 changed files with 271 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/nxglyphs/images/cursor-resize-16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

BIN
graphics/nxglyphs/images/cursor-resize-30x30.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
graphics/nxglyphs/images/cursor-resize-61x62.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 B

65
graphics/nxglyphs/include/cursor-resize-16x16.h Normal file
View File

@ -0,0 +1,65 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24_GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_resizeCursorImage[] =
{
0x00, 0x02, 0x80, 0x00, /* Row 0 */
0x00, 0x0b, 0xe0, 0x00, /* Row 1 */
0x00, 0x2d, 0x78, 0x00, /* Row 2 */
0x00, 0xa9, 0x6a, 0x00, /* Row 3 */
0x02, 0x09, 0x60, 0x80, /* Row 4 */
0x0a, 0x09, 0x60, 0xa0, /* Row 5 */
0x2e, 0xa9, 0x6a, 0xb8, /* Row 6 */
0xb5, 0x55, 0x55, 0x5e, /* Row 7 */
0xb5, 0x55, 0x55, 0x5e, /* Row 8 */
0x2e, 0xa9, 0x6a, 0xb8, /* Row 9 */
0x0a, 0x09, 0x60, 0xa0, /* Row 10 */
0x02, 0x09, 0x60, 0x80, /* Row 11 */
0x00, 0xa9, 0x6a, 0x00, /* Row 12 */
0x00, 0x2d, 0x78, 0x00, /* Row 13 */
0x00, 0x0b, 0xe0, 0x00, /* Row 14 */
0x00, 0x02, 0x80, 0x00, /* Row 15 */
};
const struct nx_cursorimage_s g_resizeCursor =
{
.size =
{
.w = 16,
.h = 16
},
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_resizeCursorImage
};

79
graphics/nxglyphs/include/cursor-resize-30x30.h Normal file
View File

@ -0,0 +1,79 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24_GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_resizeCursorImage[] =
{
0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, /* Row 0 */
0x00, 0x00, 0x00, 0x2f, 0x80, 0x00, 0x00, 0x00, /* Row 1 */
0x00, 0x00, 0x00, 0xb5, 0xe0, 0x00, 0x00, 0x00, /* Row 2 */
0x00, 0x00, 0x02, 0xd5, 0x78, 0x00, 0x00, 0x00, /* Row 3 */
0x00, 0x00, 0x0b, 0x55, 0x5e, 0x00, 0x00, 0x00, /* Row 4 */
0x00, 0x00, 0x2d, 0x55, 0x57, 0x80, 0x00, 0x00, /* Row 5 */
0x00, 0x00, 0xaa, 0x95, 0x6a, 0xa0, 0x00, 0x00, /* Row 6 */
0x00, 0x00, 0x00, 0x95, 0x60, 0x00, 0x00, 0x00, /* Row 7 */
0x00, 0x08, 0x00, 0x95, 0x60, 0x02, 0x00, 0x00, /* Row 8 */
0x00, 0x28, 0x00, 0x95, 0x60, 0x02, 0x80, 0x00, /* Row 9 */
0x00, 0xb8, 0x00, 0x95, 0x60, 0x02, 0xe0, 0x00, /* Row 10 */
0x02, 0xd8, 0x00, 0x95, 0x60, 0x02, 0x78, 0x00, /* Row 11 */
0x0b, 0x5a, 0xaa, 0x95, 0x6a, 0xaa, 0x5e, 0x00, /* Row 12 */
0x2d, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x80, /* Row 13 */
0xb5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xe0, /* Row 14 */
0x2d, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x80, /* Row 15 */
0x0b, 0x5a, 0xaa, 0x95, 0x6a, 0xaa, 0x5e, 0x00, /* Row 16 */
0x02, 0xd8, 0x00, 0x95, 0x60, 0x02, 0x78, 0x00, /* Row 17 */
0x00, 0xb8, 0x00, 0x95, 0x60, 0x02, 0xe0, 0x00, /* Row 18 */
0x00, 0x28, 0x00, 0x95, 0x60, 0x02, 0x80, 0x00, /* Row 19 */
0x00, 0x08, 0x00, 0x95, 0x60, 0x02, 0x00, 0x00, /* Row 20 */
0x00, 0x00, 0x00, 0x95, 0x60, 0x00, 0x00, 0x00, /* Row 21 */
0x00, 0x00, 0x00, 0x95, 0x60, 0x00, 0x00, 0x00, /* Row 22 */
0x00, 0x00, 0xaa, 0x95, 0x6a, 0xa0, 0x00, 0x00, /* Row 23 */
0x00, 0x00, 0x2d, 0x55, 0x57, 0x80, 0x00, 0x00, /* Row 24 */
0x00, 0x00, 0x0b, 0x55, 0x5e, 0x00, 0x00, 0x00, /* Row 25 */
0x00, 0x00, 0x02, 0xd5, 0x78, 0x00, 0x00, 0x00, /* Row 26 */
0x00, 0x00, 0x00, 0xb5, 0xe0, 0x00, 0x00, 0x00, /* Row 27 */
0x00, 0x00, 0x00, 0x2f, 0x80, 0x00, 0x00, 0x00, /* Row 28 */
0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, /* Row 29 */
};
const struct nx_cursorimage_s g_resizeCursor =
{
.size =
{
.w = 30,
.h = 30
},
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_resizeCursorImage
};

111
graphics/nxglyphs/include/cursor-resize-61x62.h Normal file
View File

@ -0,0 +1,111 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24_GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_resizeCursorImage[] =
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 0 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 1 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 2 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xd5, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 3 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x55, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 4 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x55, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 5 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x55, 0x55, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 6 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xd5, 0x55, 0x55, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x55, 0x55, 0x55, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 8 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x55, 0x55, 0x55, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 9 */
0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x55, 0x55, 0x55, 0x55, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 10 */
0x00, 0x00, 0x00, 0x00, 0x02, 0xd5, 0x55, 0x55, 0x55, 0x55, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 11 */
0x00, 0x00, 0x00, 0x00, 0x0a, 0xaa, 0xa9, 0x55, 0x56, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 12 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 13 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 14 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 15 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 16 */
0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 17 */
0x00, 0x00, 0x02, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, /* Row 18 */
0x00, 0x00, 0x09, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, /* Row 19 */
0x00, 0x00, 0x25, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, /* Row 20 */
0x00, 0x00, 0x95, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00, 0x00, /* Row 21 */
0x00, 0x02, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x97, 0x80, 0x00, 0x00, /* Row 22 */
0x00, 0x09, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0xe0, 0x00, 0x00, /* Row 23 */
0x00, 0x25, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0x78, 0x00, 0x00, /* Row 24 */
0x00, 0x95, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0x5e, 0x00, 0x00, /* Row 25 */
0x02, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xa9, 0x55, 0x56, 0xaa, 0xaa, 0xaa, 0x95, 0x57, 0x80, 0x00, /* Row 26 */
0x09, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xe0, 0x00, /* Row 27 */
0x25, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x78, 0x00, /* Row 28 */
0x95, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5e, 0x00, /* Row 29 */
0x95, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x80, /* Row 30 */
0x25, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x80, /* Row 31 */
0x09, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5e, 0x00, /* Row 32 */
0x02, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x78, 0x00, /* Row 33 */
0x00, 0x95, 0x55, 0xaa, 0xaa, 0xaa, 0xa9, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0x55, 0xe0, 0x00, /* Row 34 */
0x00, 0x25, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0x57, 0x80, 0x00, /* Row 35 */
0x00, 0x09, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0x5e, 0x00, 0x00, /* Row 36 */
0x00, 0x02, 0x55, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0x78, 0x00, 0x00, /* Row 37 */
0x00, 0x00, 0x95, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x95, 0xe0, 0x00, 0x00, /* Row 38 */
0x00, 0x00, 0x25, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x97, 0x80, 0x00, 0x00, /* Row 39 */
0x00, 0x00, 0x09, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00, 0x00, /* Row 40 */
0x00, 0x00, 0x02, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, /* Row 41 */
0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, /* Row 42 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, /* Row 43 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 44 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 45 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 46 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x55, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 47 */
0x00, 0x00, 0x00, 0x00, 0x0a, 0xaa, 0xa9, 0x55, 0x56, 0xaa, 0xaa, 0x80, 0x00, 0x00, 0x00, 0x00, /* Row 48 */
0x00, 0x00, 0x00, 0x00, 0x02, 0xd5, 0x55, 0x55, 0x55, 0x55, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 49 */
0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x55, 0x55, 0x55, 0x55, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 50 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x55, 0x55, 0x55, 0x55, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 51 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x55, 0x55, 0x55, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 52 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xd5, 0x55, 0x55, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 53 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x55, 0x55, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 54 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x55, 0x55, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 55 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x55, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 56 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xd5, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 57 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 58 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 59 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 60 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 61 */
};
const struct nx_cursorimage_s g_resizeCursor =
{
.size =
{
.w = 61,
.h = 62
},
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_resizeCursorImage
};

9
graphics/twm4nx/src/cresize.cxx
View File

@ -63,6 +63,7 @@
#include "graphics/twm4nx/cwindow.hxx" #include "graphics/twm4nx/cwindow.hxx"
#include "graphics/twm4nx/ctwm4nxevent.hxx" #include "graphics/twm4nx/ctwm4nxevent.hxx"
#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/twm4nx_events.hxx"
#include "graphics/twm4nx/twm4nx_cursor.hxx"
#include "graphics/twm4nx/cresize.hxx" #include "graphics/twm4nx/cresize.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -525,9 +526,9 @@ bool CResize::startResize(FAR struct SEventMsg *eventmsg)
m_resized = false; m_resized = false;
#ifdef CONFIG_TWM4NX_MOUSE #ifdef CONFIG_TWM4NX_MOUSE
// Select the resize cursor // Select the resize cursor image
# warning Missing logic m_twm4nx->setCursorImage(&CONFIG_TWM4NX_RZCURSOR_IMAGE);
#endif #endif
return true; return true;
@ -732,9 +733,9 @@ bool CResize::resumeResize(FAR struct SEventMsg *eventmsg)
} }
#ifdef CONFIG_TWM4NX_MOUSE #ifdef CONFIG_TWM4NX_MOUSE
// Restore the normal cursor // Restore the normal cursor image
# warning Missing logic m_twm4nx->setCursorImage(&CONFIG_TWM4NX_CURSOR_IMAGE);
#endif #endif
// Reset the the window position and size // Reset the the window position and size

2
graphics/twm4nx/src/twm4nx_cursor.cxx
View File

@ -54,10 +54,12 @@ namespace Twm4Nx
#ifdef CONFIG_TWM4NX_CURSOR_LARGE #ifdef CONFIG_TWM4NX_CURSOR_LARGE
# include "cursor-arrow1-30x30.h" # include "cursor-arrow1-30x30.h"
# include "cursor-grab-25x30.h" # include "cursor-grab-25x30.h"
# include "cursor-resize-30x30.h"
# include "cursor-wait-23x30.h" # include "cursor-wait-23x30.h"
#else #else
# include "cursor-arrow1-16x16.h" # include "cursor-arrow1-16x16.h"
# include "cursor-grab-14x16.h" # include "cursor-grab-14x16.h"
# include "cursor-resize-16x16.h"
# include "cursor-wait-13x16.h" # include "cursor-wait-13x16.h"
#endif #endif
} }

4
include/graphics/twm4nx/twm4nx_config.hxx
View File

@ -279,6 +279,10 @@
# define CONFIG_TWM4NX_GBCURSOR_IMAGE g_grabCursor # define CONFIG_TWM4NX_GBCURSOR_IMAGE g_grabCursor
#endif #endif
#ifndef CONFIG_TWM4NX_RZCURSOR_IMAGE // Resize cursor image
# define CONFIG_TWM4NX_RZCURSOR_IMAGE g_resizeCursor
#endif
#ifndef CONFIG_TWM4NX_WTCURSOR_IMAGE // Wait cursor image #ifndef CONFIG_TWM4NX_WTCURSOR_IMAGE // Wait cursor image
# define CONFIG_TWM4NX_WTCURSOR_IMAGE g_waitCursor # define CONFIG_TWM4NX_WTCURSOR_IMAGE g_waitCursor
#endif #endif

8
include/graphics/twm4nx/twm4nx_cursor.hxx
View File

@ -54,11 +54,13 @@
namespace Twm4Nx namespace Twm4Nx
{ {
extern const struct nx_cursorimage_s // Normal cursor extern const struct nx_cursorimage_s // Normal cursor image
CONFIG_TWM4NX_CURSOR_IMAGE; CONFIG_TWM4NX_CURSOR_IMAGE;
extern const struct nx_cursorimage_s // Grab button extern const struct nx_cursorimage_s // Grab cursor image
CONFIG_TWM4NX_GBCURSOR_IMAGE; CONFIG_TWM4NX_GBCURSOR_IMAGE;
extern const struct nx_cursorimage_s // Wait cursor extern const struct nx_cursorimage_s // Resize cursor image
CONFIG_TWM4NX_RZCURSOR_IMAGE;
extern const struct nx_cursorimage_s // Wait cursor image
CONFIG_TWM4NX_WTCURSOR_IMAGE; CONFIG_TWM4NX_WTCURSOR_IMAGE;
} }