Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe_closewindow.c
+1 -1
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 */
graphics/nxglib/cursor/nxglib_cursor_backup.c
+2 -2
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. */
graphics/nxglib/cursor/nxglib_cursor_draw.c
+2 -2
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. */
graphics/nxglib/cursor/nxglib_cursor_erase.c
+2 -2
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. */