diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-02 20:02:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-02 20:02:59 +0000 |
| commit | aebaefc303f12beb92c4da219411bdb00aa4e03c (patch) | |
| tree | 770fd1403c0aaf22a23220a4f95f689de9f8cf70 /nuttx/graphics/nxtk/nxtk_setsubwindows.c | |
| parent | 124c331605b174afc08f7ef498209952b4a1dbc5 (diff) | |
| download | px4-nuttx-aebaefc303f12beb92c4da219411bdb00aa4e03c.tar.gz px4-nuttx-aebaefc303f12beb92c4da219411bdb00aa4e03c.tar.bz2 px4-nuttx-aebaefc303f12beb92c4da219411bdb00aa4e03c.zip | |
Don't keep sizes in rectangles
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1392 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxtk/nxtk_setsubwindows.c')
| -rw-r--r-- | nuttx/graphics/nxtk/nxtk_setsubwindows.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/graphics/nxtk/nxtk_setsubwindows.c b/nuttx/graphics/nxtk/nxtk_setsubwindows.c index 443fa92c3..57c280c73 100644 --- a/nuttx/graphics/nxtk/nxtk_setsubwindows.c +++ b/nuttx/graphics/nxtk/nxtk_setsubwindows.c @@ -142,7 +142,7 @@ void nxtk_setsubwindows(FAR struct nxtk_framedwindow_s *fwnd) /* Divide up the horizontal dimensions of the window */ - fullwidth = fwnd->wnd.bounds.pt2.x - fwnd->wnd.bounds.pt1.x; + fullwidth = fwnd->wnd.bounds.pt2.x - fwnd->wnd.bounds.pt1.x + 1; bdrwidth = ngl_min(2 * CONFIG_NXTK_BORDERWIDTH, fullwidth); fwwidth = fullwidth - bdrwidth; fwleft = fwnd->wnd.origin.x + bdrwidth/2; @@ -151,11 +151,11 @@ void nxtk_setsubwindows(FAR struct nxtk_framedwindow_s *fwnd) fwnd->tbrect.pt1.x = fwleft; fwnd->tbrect.pt1.y = tbtop; - fwnd->tbrect.pt2.x = fwleft + fwwidth; + fwnd->tbrect.pt2.x = fwleft + fwwidth - 1; fwnd->tbrect.pt2.y = tbtop + tbheight - 1; fwnd->fwrect.pt1.x = fwleft; fwnd->fwrect.pt1.y = fwtop; - fwnd->fwrect.pt2.x = fwleft + fwwidth; + fwnd->fwrect.pt2.x = fwleft + fwwidth - 1; fwnd->fwrect.pt2.y = fwtop + fwheight - 1; } |