diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-04 07:54:26 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-04 07:54:26 -0600 |
| commit | 87b4c6a3048f34bfb828285fbd48237aa60464cf (patch) | |
| tree | 8f41a1c6c037ecb034ec9930183824d3e05e2df6 /NxWidgets/libnxwidgets | |
| parent | 5d0aaebaa4a9bc03a1813425d4721c5550f46ba1 (diff) | |
| download | nuttx-87b4c6a3048f34bfb828285fbd48237aa60464cf.tar.gz nuttx-87b4c6a3048f34bfb828285fbd48237aa60464cf.tar.bz2 nuttx-87b4c6a3048f34bfb828285fbd48237aa60464cf.zip | |
NxWidgets::CImage: Allow NULL bitmaps. From Petteri Aimonen
Diffstat (limited to 'NxWidgets/libnxwidgets')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cimage.cxx | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/NxWidgets/libnxwidgets/src/cimage.cxx b/NxWidgets/libnxwidgets/src/cimage.cxx index 9b3137129..b9b93ebb6 100644 --- a/NxWidgets/libnxwidgets/src/cimage.cxx +++ b/NxWidgets/libnxwidgets/src/cimage.cxx @@ -138,19 +138,29 @@ CImage::CImage(CWidgetControl *pWidgetControl, nxgl_coord_t x, nxgl_coord_t y, void CImage::getPreferredDimensions(CRect &rect) const { - nxgl_coord_t width = m_bitmap->getWidth(); - nxgl_coord_t height = m_bitmap->getHeight(); - - if (!m_flags.borderless) + if (!m_bitmap) { - width += (m_borderSize.left + m_borderSize.right); - height += (m_borderSize.top + m_borderSize.bottom); + rect.setX(m_rect.getX()); + rect.setY(m_rect.getY()); + rect.setWidth(0); + rect.setHeight(0); } + else + { + nxgl_coord_t width = m_bitmap->getWidth(); + nxgl_coord_t height = m_bitmap->getHeight(); - rect.setX(m_rect.getX()); - rect.setY(m_rect.getY()); - rect.setWidth(width); - rect.setHeight(height); + if (!m_flags.borderless) + { + width += (m_borderSize.left + m_borderSize.right); + height += (m_borderSize.top + m_borderSize.bottom); + } + + rect.setX(m_rect.getX()); + rect.setY(m_rect.getY()); + rect.setWidth(width); + rect.setHeight(height); + } } /** @@ -440,7 +450,7 @@ void CImage::onReleaseOutside(nxgl_coord_t x, nxgl_coord_t y) void CImage::setImageLeft(nxgl_coord_t column) { - if (column > 0 && column <= m_bitmap->getWidth()) + if (m_bitmap && column > 0 && column <= m_bitmap->getWidth()) { m_origin.x = column; } @@ -455,7 +465,7 @@ void CImage::setImageLeft(nxgl_coord_t column) void CImage::setImageTop(nxgl_coord_t row) { - if (row > 0 && row <= m_bitmap->getHeight()) + if (m_bitmap && row > 0 && row <= m_bitmap->getHeight()) { m_origin.x = row; } |