diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-14 14:52:17 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-14 14:52:17 -0600 |
| commit | 360abde7b0f21861292648de869ab0d1ba655444 (patch) | |
| tree | 0a6742d3c1fcabf62c07992fa8e9dff53cad3583 /NxWidgets/libnxwidgets/src | |
| parent | b33449923aee0b4320bed6b3f4880fcc75da32ab (diff) | |
| download | nuttx-360abde7b0f21861292648de869ab0d1ba655444.tar.gz nuttx-360abde7b0f21861292648de869ab0d1ba655444.tar.bz2 nuttx-360abde7b0f21861292648de869ab0d1ba655444.zip | |
NxWM::CCalibration: Add an option to provide some instructions in the center of the calibration screen
Diffstat (limited to 'NxWidgets/libnxwidgets/src')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/clabel.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/NxWidgets/libnxwidgets/src/clabel.cxx b/NxWidgets/libnxwidgets/src/clabel.cxx index 376d2ce8f..319b707b6 100644 --- a/NxWidgets/libnxwidgets/src/clabel.cxx +++ b/NxWidgets/libnxwidgets/src/clabel.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -119,7 +119,7 @@ CLabel::CLabel(CWidgetControl *pWidgetControl, m_vAlignment = TEXT_ALIGNMENT_VERT_CENTER; // The border thickness is 1 pixel - + m_borderSize.top = 1; m_borderSize.right = 1; m_borderSize.bottom = 1; @@ -272,7 +272,7 @@ void CLabel::setFont(CNxFont *font) * * @see redraw() */ - + void CLabel::drawContents(CGraphicsPort *port) { // Get the drawing area (excluding the border) @@ -318,7 +318,7 @@ void CLabel::drawContents(CGraphicsPort *port) CNxFont* font = getFont(); int height = font->getHeight(); int width = font->getStringWidth(m_text); - + // Draw the background (excluding the border and the text area) port->drawFilledRect(rect.getX(), rect.getY(), @@ -393,7 +393,7 @@ void CLabel::calculateTextPositionVertical(void) case TEXT_ALIGNMENT_VERT_TOP: m_align.y = 0; break; - + case TEXT_ALIGNMENT_VERT_BOTTOM: m_align.y = height - getFont()->getHeight(); break; @@ -409,7 +409,7 @@ void CLabel::calculateTextPositionHorizontal(void) { CRect rect; getClientRect(rect); - + nxgl_coord_t width = rect.getWidth(); switch (m_hAlignment) |