diff --git a/ChangeLog b/ChangeLog index ea844c2e02a..6d30891af5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2712,4 +2712,7 @@ IO Expander and touchscreen driver. * configs/stm3240g-eval/nxwm: Added to configuration for testing the NxWM window manager on the STM3240G-EVAL board. + * graphics/nxtk/nxtk_toolbarbounds.c: Added an interface to get the toolbar + bounding box. + * graphics/nxtk/nxtk_drawframe.c: Fix an error in drawing the window frame. diff --git a/graphics/nxtk/Make.defs b/graphics/nxtk/Make.defs index 722613af4f5..be3e1f721a8 100644 --- a/graphics/nxtk/Make.defs +++ b/graphics/nxtk/Make.defs @@ -43,6 +43,6 @@ NXTKWIN_CSRCS = nxtk_openwindow.c nxtk_closewindow.c nxtk_getposition.c \ NXTKTB_CSRCS = nxtk_opentoolbar.c nxtk_closetoolbar.c nxtk_filltoolbar.c \ nxtk_gettoolbar.c nxtk_filltraptoolbar.c nxtk_movetoolbar.c \ nxtk_bitmaptoolbar.c nxtk_drawcircletoolbar.c nxtk_drawlinetoolbar.c \ - nxtk_fillcircletoolbar.c + nxtk_fillcircletoolbar.c nxtk_toolbarbounds.c NXTK_CSRCS = $(NXTKWIN_CSRCS) $(NXTKTB_CSRCS) nxtk_subwindowclip.c \ nxtk_containerclip.c nxtk_subwindowmove.c nxtk_drawframe.c diff --git a/graphics/nxtk/nxtk_drawframe.c b/graphics/nxtk/nxtk_drawframe.c index 1ffbf689b7b..2530347d25d 100644 --- a/graphics/nxtk/nxtk_drawframe.c +++ b/graphics/nxtk/nxtk_drawframe.c @@ -274,5 +274,37 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, #endif #endif + /* Fix up the little line-seqments at the top inner edges that need to match + * the color of the toolbar. + */ + +#if CONFIG_NXTK_BORDERWIDTH > 1 + if (tbsize.h > 0) + { + /* Draw the right side */ + +#if CONFIG_NXTK_BORDERWIDTH > 2 + frame.pt1.x = thickness + 1; + frame.pt1.y = 1; + frame.pt2.x = frame.pt1.x; + frame.pt2.y = tbsize.h + thickness; +#else + frame.pt1.x = thickness; + frame.pt1.y = 0; + frame.pt2.x = frame.pt1.x; + frame.pt2.y = tbsize.h + thickness - 1; +#endif + nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1); + + /* Draw the left size */ + +#if CONFIG_NXTK_BORDERWIDTH > 2 + frame.pt1.x = wndsize.w - thickness - 2; + frame.pt2.x = frame.pt1.x; + nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1); +#endif + } +#endif + return OK; } diff --git a/graphics/nxtk/nxtk_toolbarbounds.c b/graphics/nxtk/nxtk_toolbarbounds.c new file mode 100644 index 00000000000..ee49cb5044e --- /dev/null +++ b/graphics/nxtk/nxtk_toolbarbounds.c @@ -0,0 +1,107 @@ +/**************************************************************************** + * graphics/nxtk/nxtk_toolbarbounds.c + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include +#include + +#include "nxfe.h" +#include "nxtk_internal.h" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxtk_toolbarbounds + * + * Description: + * Return a bounding box that contains the toolbar in the coordinates of + * the containing, framed window. For example, the recturned origin + * (rect.pt1) is the offset toolbar in the framed window. + * + * NOTE: This function is unsafe in the case of the multi-user NX server + * where the width of the window may be being changed asynchronously! It + * may return the old size in this case. + * + * Input Parameters: + * hfwnd - The handle returned by nxtk_openwindow + * bounds - User provided location in which to return the bounding box. + * + * Return: + * OK on success; ERROR on failure with errno set appropriately + * + ****************************************************************************/ + +int nxtk_toolbarbounds(NXTKWINDOW hfwnd, FAR struct nxgl_rect_s *bounds) +{ + FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + + DEBUGASSERT(hfwnd && bounds); + + /* Offset the rectangle by subtracting the current position of the window. */ + + nxgl_rectoffset(bounds, &fwnd->tbrect, + -fwnd->wnd.bounds.pt1.x, -fwnd->wnd.bounds.pt1.y); + return OK; +} + diff --git a/include/nuttx/nx/nxtk.h b/include/nuttx/nx/nxtk.h index 5273ef54c94..8bf711f2649 100644 --- a/include/nuttx/nx/nxtk.h +++ b/include/nuttx/nx/nxtk.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/nuttx/nx/nxtk.h * - * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -114,7 +114,7 @@ EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd); * * Description: * Request the position and size information for the selected framed window. - * The size/position for the client window and toolbar will be return + * The size/position for the client window and toolbar will be returned * asynchronously through the client callback function pointer. * * Input Parameters: @@ -422,6 +422,29 @@ EXTERN int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height, EXTERN int nxtk_closetoolbar(NXTKWINDOW hfwnd); +/**************************************************************************** + * Name: nxtk_toolbarbounds + * + * Description: + * Return a bounding box that contains the toolbar in the coordinates of + * the containing, framed window. For example, the recturned origin + * (rect.pt1) is the offset toolbar in the framed window. + * + * NOTE: This function is unsafe in the case of the multi-user NX server + * where the width of the window may be being changed asynchronously! It + * may return the old size in this case. + * + * Input Parameters: + * hfwnd - The handle returned by nxtk_openwindow + * bounds - User provided location in which to return the bounding box. + * + * Return: + * OK on success; ERROR on failure with errno set appropriately + * + ****************************************************************************/ + +EXTERN int nxtk_toolbarbounds(NXTKWINDOW hfwnd, FAR struct nxgl_rect_s *bounds); + /**************************************************************************** * Name: nxtk_filltoolbar *