summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-10-14 14:52:17 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-10-14 14:52:17 -0600
commit360abde7b0f21861292648de869ab0d1ba655444 (patch)
tree0a6742d3c1fcabf62c07992fa8e9dff53cad3583 /NxWidgets/libnxwidgets
parentb33449923aee0b4320bed6b3f4880fcc75da32ab (diff)
downloadpx4-nuttx-360abde7b0f21861292648de869ab0d1ba655444.tar.gz
px4-nuttx-360abde7b0f21861292648de869ab0d1ba655444.tar.bz2
px4-nuttx-360abde7b0f21861292648de869ab0d1ba655444.zip
NxWM::CCalibration: Add an option to provide some instructions in the center of the calibration screen
Diffstat (limited to 'NxWidgets/libnxwidgets')
-rw-r--r--NxWidgets/libnxwidgets/include/clabel.hxx12
-rw-r--r--NxWidgets/libnxwidgets/include/cnxstring.hxx4
-rw-r--r--NxWidgets/libnxwidgets/src/clabel.cxx12
3 files changed, 14 insertions, 14 deletions
diff --git a/NxWidgets/libnxwidgets/include/clabel.hxx b/NxWidgets/libnxwidgets/include/clabel.hxx
index 62ed1cda7..ccadb55ee 100644
--- a/NxWidgets/libnxwidgets/include/clabel.hxx
+++ b/NxWidgets/libnxwidgets/include/clabel.hxx
@@ -73,7 +73,7 @@
/****************************************************************************
* Included Files
****************************************************************************/
-
+
#include <nuttx/config.h>
#include <stdint.h>
@@ -88,11 +88,11 @@
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
-
+
/****************************************************************************
* Implementation Classes
****************************************************************************/
-
+
#if defined(__cplusplus)
namespace NXWidgets
@@ -150,7 +150,7 @@ namespace NXWidgets
*
* @see redraw()
*/
-
+
virtual void drawContents(CGraphicsPort *port);
/**
@@ -240,7 +240,7 @@ namespace NXWidgets
*/
virtual void setTextAlignmentVert(TextAlignmentVert alignment);
-
+
/**
* Set the horizontal alignment of text within the label.
*
@@ -262,7 +262,7 @@ namespace NXWidgets
{
return m_vAlignment;
}
-
+
/**
* Returns the string shown in the label.
*
diff --git a/NxWidgets/libnxwidgets/include/cnxstring.hxx b/NxWidgets/libnxwidgets/include/cnxstring.hxx
index 91bd253c7..247919116 100644
--- a/NxWidgets/libnxwidgets/include/cnxstring.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxstring.hxx
@@ -74,7 +74,7 @@
/****************************************************************************
* Included Files
****************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -122,7 +122,7 @@ namespace NXWidgets
{
private:
friend class CStringIterator;
-
+
int m_stringLength; /**< Number of characters in the string */
int m_allocatedSize; /**< Number of bytes allocated for this string */
int m_growAmount; /**< Number of chars that the string grows by
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)