diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-08 15:28:07 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-08 15:28:07 +0000 |
commit | b6abad5fbf5877bf9c26269bff418726f26e4b9d (patch) | |
tree | 945b66a02dfe50fed4a55a500a96f11d81d7d9e3 /NxWidgets/libnxwidgets | |
parent | 1442e62637fa138626671be49b51d5329c6536c3 (diff) | |
download | nuttx-b6abad5fbf5877bf9c26269bff418726f26e4b9d.tar.gz nuttx-b6abad5fbf5877bf9c26269bff418726f26e4b9d.tar.bz2 nuttx-b6abad5fbf5877bf9c26269bff418726f26e4b9d.zip |
Several patches from Petteri Aimonen
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5625 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets')
-rw-r--r-- | NxWidgets/libnxwidgets/include/ccyclebutton.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxwidget.hxx | 7 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/ccyclebutton.cxx | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/NxWidgets/libnxwidgets/include/ccyclebutton.hxx b/NxWidgets/libnxwidgets/include/ccyclebutton.hxx index f7f965933..d8a32175e 100644 --- a/NxWidgets/libnxwidgets/include/ccyclebutton.hxx +++ b/NxWidgets/libnxwidgets/include/ccyclebutton.hxx @@ -152,7 +152,7 @@ namespace NXWidgets * @param y The y coordinate of the mouse. */ - virtual void onRelease(nxgl_coord_t x, nxgl_coord_t y); + virtual void onPreRelease(nxgl_coord_t x, nxgl_coord_t y); /** * Redraws the button. diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx index 32e3dfbc6..a6982660b 100644 --- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx @@ -797,6 +797,13 @@ namespace NXWidgets } /** + * Get the style used by this widget + * + * @return Const pointer to CWidgetStyle stored inside this widget. + */ + inline const CWidgetStyle *getWidgetStyle() const { return &m_style; } + + /** * Sets this widget's border state. * * @param isBorderless The border state. diff --git a/NxWidgets/libnxwidgets/src/ccyclebutton.cxx b/NxWidgets/libnxwidgets/src/ccyclebutton.cxx index 0fdbba73c..b4dff685b 100644 --- a/NxWidgets/libnxwidgets/src/ccyclebutton.cxx +++ b/NxWidgets/libnxwidgets/src/ccyclebutton.cxx @@ -424,7 +424,7 @@ void CCycleButton::drawOutline(CGraphicsPort *port) * @param y The y coordinate of the mouse. */ -void CCycleButton::onRelease(nxgl_coord_t x, nxgl_coord_t y) +void CCycleButton::onPreRelease(nxgl_coord_t x, nxgl_coord_t y) { // Choose next option @@ -447,6 +447,8 @@ void CCycleButton::onRelease(nxgl_coord_t x, nxgl_coord_t y) } redraw(); + + CButton::onPreRelease(x, y); } /** |