diff options
Diffstat (limited to 'NxWidgets/libnxwidgets/src')
-rw-r--r-- | NxWidgets/libnxwidgets/src/cimage.cxx | 37 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cstickyimage.cxx | 120 |
2 files changed, 152 insertions, 5 deletions
diff --git a/NxWidgets/libnxwidgets/src/cimage.cxx b/NxWidgets/libnxwidgets/src/cimage.cxx index eb7e5157f..1140df35d 100644 --- a/NxWidgets/libnxwidgets/src/cimage.cxx +++ b/NxWidgets/libnxwidgets/src/cimage.cxx @@ -165,13 +165,14 @@ void CImage::getPreferredDimensions(CRect &rect) const /** * Draw the area of this widget that falls within the clipping region. - * Called by the redraw() function to draw all visible regions. + * Called by the drawContents(port) and by classes that inherit from + * CImage. * * @param port The CGraphicsPort to draw to. * @see redraw() */ -void CImage::drawContents(CGraphicsPort *port) +void CImage::drawContents(CGraphicsPort *port, bool selected) { if (!m_bitmap) { @@ -201,7 +202,7 @@ void CImage::drawContents(CGraphicsPort *port) // Select the correct colorization - m_bitmap->setSelected(isClicked() || m_highlighted); + m_bitmap->setSelected(selected || m_highlighted); // This is the end row + 1 that we can write into @@ -349,7 +350,20 @@ void CImage::drawContents(CGraphicsPort *port) * @see redraw() */ -void CImage::drawBorder(CGraphicsPort *port) +void CImage::drawContents(CGraphicsPort *port) +{ + drawContents(port, isClicked()); +} + +/** + * Draw the border of this widget. Called by the indirectly via + * drawBoard(port) and also by classes that inherit from CImage. + * + * @param port The CGraphicsPort to draw to. + * @see redraw() + */ + +void CImage::drawBorder(CGraphicsPort *port, bool selected) { // Stop drawing if the widget indicates it should not have an outline @@ -363,7 +377,7 @@ void CImage::drawBorder(CGraphicsPort *port) nxgl_coord_t color1; nxgl_coord_t color2; - if (isClicked()) + if (selected) { // Bevelled into the screen @@ -382,6 +396,19 @@ void CImage::drawBorder(CGraphicsPort *port) } /** + * Draw the border of this widget. Called by the redraw() function to draw + * all visible regions. + * + * @param port The CGraphicsPort to draw to. + * @see redraw() + */ + +void CImage::drawBorder(CGraphicsPort *port) +{ + drawBorder(port, isClicked()); +} + +/** * Control the highlight state. * * @param highlightOn True(1), the image will be highlighted diff --git a/NxWidgets/libnxwidgets/src/cstickyimage.cxx b/NxWidgets/libnxwidgets/src/cstickyimage.cxx new file mode 100644 index 000000000..a4f9c6849 --- /dev/null +++ b/NxWidgets/libnxwidgets/src/cstickyimage.cxx @@ -0,0 +1,120 @@ +/**************************************************************************** + * NxWidgets/libnxwidgets/src/cstickyimage.cxx + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * 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, NxWidgets, nor the names of its contributors + * me 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 <nuttx/config.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> + +#include <nuttx/nx/nxglib.h> + +#include "cstickyimage.hxx" +#include "cgraphicsport.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * CImage Method Implementations + ****************************************************************************/ + +using namespace NXWidgets; + +/** + * Constructor for an image. + * + * @param pWidgetControl The controlling widget for the display + * @param x The x coordinate of the image box, relative to its parent. + * @param y The y coordinate of the image box, relative to its parent. + * @param width The width of the image box. + * @param height The height of the image box. + * @param bitmap The source bitmap image. + * @param style The style that the widget should use. If this is not + * specified, the button will use the global default widget + * style. + */ + +CStickyImage::CStickyImage(CWidgetControl *pWidgetControl, + nxgl_coord_t x, nxgl_coord_t y, + nxgl_coord_t width, nxgl_coord_t height, + FAR IBitmap *bitmap, CWidgetStyle *style) +: CImage(pWidgetControl, x, y, width, height, bitmap, style) +{ + m_stuckSelection = false; +} + +/** + * Sets the image's stuck selection state. + * + * @param selection The new stuck selection state. + */ + +void CStickyImage::setStuckSelection(bool selection) +{ + m_stuckSelection = selection; + redraw(); +} + +/** + * Draw the area of this widget that falls within the clipping region. + * Called by the redraw() function to draw all visible regions. + * + * @param port The CGraphicsPort to draw to. + * @see redraw() + */ + +void CStickyImage::drawContents(CGraphicsPort *port) +{ + CImage::drawContents(port, m_stuckSelection); +} + +/** + * Draw the area of this widget that falls within the clipping region. + * Called by the redraw() function to draw all visible regions. + * + * @param port The CGraphicsPort to draw to. + * @see redraw() + */ + +void CStickyImage::drawBorder(CGraphicsPort *port) +{ + CImage::drawBorder(port, m_stuckSelection); +} |