nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 08:38:38 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/nxbe: Some bugfix found early in cursor testing.

Browse source
This commit is contained in:
Gregory Nutt 2019-04-10 12:31:43 -06:00
parent d3bf5c7408
commit ad76ca674b
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/nxbe/nxbe_closewindow.c
View file

@ -89,7 +89,7 @@ void nxbe_closewindow(FAR struct nxbe_window_s *wnd)
* indicate the modal state.
*/
DEBUGASSERT(wnd->above == NULL & NXBE_STATE_ISMODAL(be));
DEBUGASSERT(wnd->above == NULL && NXBE_STATE_ISMODAL(be));
/* Leave the modal state */

4
graphics/nxglib/cursor/nxglib_cursor_backup.c
View file

@ -100,8 +100,8 @@ void NXGL_FUNCNAME(nxglib_cursor_backup, NXGLIB_SUFFIX)
{
/* Get the width and the height of the images in pixels/rows */
width = be->cursor.bounds.pt2.x = be->cursor.bounds.pt1.x + 1;
height = be->cursor.bounds.pt2.y = be->cursor.bounds.pt1.y + 1;
width = be->cursor.bounds.pt2.x - be->cursor.bounds.pt1.x + 1;
height = be->cursor.bounds.pt2.y - be->cursor.bounds.pt1.y + 1;
/* Get the width of the images in bytes. */

4
graphics/nxglib/cursor/nxglib_cursor_draw.c
View file

@ -147,8 +147,8 @@ void NXGL_FUNCNAME(nxglib_cursor_draw, NXGLIB_SUFFIX)
{
/* Get the width and the height of the images in pixels/rows */
width = be->cursor.bounds.pt2.x = be->cursor.bounds.pt1.x + 1;
height = be->cursor.bounds.pt2.y = be->cursor.bounds.pt1.y + 1;
width = be->cursor.bounds.pt2.x - be->cursor.bounds.pt1.x + 1;
height = be->cursor.bounds.pt2.y - be->cursor.bounds.pt1.y + 1;
/* Get the width of the images in bytes. */

4
graphics/nxglib/cursor/nxglib_cursor_erase.c
View file

@ -99,8 +99,8 @@ void NXGL_FUNCNAME(nxglib_cursor_erase, NXGLIB_SUFFIX)
{
/* Get the width and the height of the images in pixels/rows */
width = be->cursor.bounds.pt2.x = be->cursor.bounds.pt1.x + 1;
height = be->cursor.bounds.pt2.y = be->cursor.bounds.pt1.y + 1;
width = be->cursor.bounds.pt2.x - be->cursor.bounds.pt1.x + 1;
height = be->cursor.bounds.pt2.y - be->cursor.bounds.pt1.y + 1;
/* Get the width of the images in bytes. */

2
include/nuttx/nx/nxcursor.h
View file

@ -165,7 +165,7 @@ int nxcursor_enable(NXHANDLE hnd, bool enable);
****************************************************************************/
#if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR)
int nxcursor_setimage(NXHANDLE hnd, FAR struct nx_cursorimage_s *image);
int nxcursor_setimage(NXHANDLE hnd, FAR const struct nx_cursorimage_s *image);
#endif
/****************************************************************************

2
libs/libnx/nxmu/nx_cursor.c
View file

@ -119,7 +119,7 @@ int nxcursor_enable(NXHANDLE hnd, bool enable)
****************************************************************************/
#if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR)
int nxcursor_setimage(NXHANDLE hnd, FAR struct nx_cursorimage_s *image)
int nxcursor_setimage(NXHANDLE hnd, FAR const struct nx_cursorimage_s *image)
{
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)hnd;
struct nxsvrmsg_curimage_s outmsg;