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/nxwm/include/ccalibration.hxx | |
| 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/nxwm/include/ccalibration.hxx')
| -rw-r--r-- | NxWidgets/nxwm/include/ccalibration.hxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/NxWidgets/nxwm/include/ccalibration.hxx b/NxWidgets/nxwm/include/ccalibration.hxx index f114a19a2..376462ca8 100644 --- a/NxWidgets/nxwm/include/ccalibration.hxx +++ b/NxWidgets/nxwm/include/ccalibration.hxx @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + #ifndef __INCLUDE_CCALIBRATION_HXX #define __INCLUDE_CCALIBRATION_HXX @@ -48,6 +48,8 @@ #include "cnxstring.hxx" #include "cwidgeteventhandler.hxx" #include "cwidgetcontrol.hxx" +#include "clabel.hxx" +#include "cnxfont.hxx" #include "ctaskbar.hxx" #include "iapplication.hxx" @@ -146,6 +148,10 @@ namespace NxWM CTaskbar *m_taskbar; /**< The taskbar (used to terminate calibration) */ CFullScreenWindow *m_window; /**< The window for the calibration display */ CTouchscreen *m_touchscreen; /**< The touchscreen device */ +#ifdef CONFIG_NXWM_CALIBRATION_MESSAGES + NXWidgets::CLabel *m_text; /**< Calibration message */ + NXWidgets::CNxFont *m_font; /**< The font used in the message */ +#endif pthread_t m_thread; /**< The calibration thread ID */ struct SCalibScreenInfo m_screenInfo; /**< Describes the current calibration display */ struct nxgl_point_s m_touchPos; /**< This is the last touch position */ |