NxWidgets: New pre-release event. Action now raised on pre-release. NxWM: Use action event to process icon touches; Fix initialization of image highlighted state.

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4740 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 22 insertions, 7 deletions

diff --git a/NxWidgets/libnxwidgets/src/cimage.cxx b/NxWidgets/libnxwidgets/src/cimage.cxx
index 7d9e0ee4e..30bf7e78b 100644
--- a/NxWidgets/libnxwidgets/src/cimage.cxx
+++ b/NxWidgets/libnxwidgets/src/cimage.cxx
@@ -70,7 +70,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <stdint.h>
@@ -116,12 +116,16 @@ CImage::CImage(CWidgetControl *pWidgetControl, nxgl_coord_t x, nxgl_coord_t y,
 {
   // Save the IBitmap instance
 
-  m_bitmap   = bitmap;
+  m_bitmap      = bitmap;
+
+  // Not highlighted
+
+  m_highlighted = false;
 
   // Position the top/lef corner of the bitmap in the top/left corner of the display
 
-  m_origin.x = 0;
-  m_origin.y = 0;
+  m_origin.x    = 0;
+  m_origin.y    = 0;
 }
 
 /**
@@ -385,20 +389,31 @@ void CImage::onClick(nxgl_coord_t x, nxgl_coord_t y)
 }
 
 /**
- * Raises an action event and redraws the button.
+ * Raises an action. 
  *
  * @param x The x coordinate of the mouse.
  * @param y The y coordinate of the mouse.
  */
 
-void CImage::onRelease(nxgl_coord_t x, nxgl_coord_t y)
+void CImage::onPreRelease(nxgl_coord_t x, nxgl_coord_t y)
 {
   m_widgetEventHandlers->raiseActionEvent();
+}
+
+/**
+ * Redraws the image.
+ *
+ * @param x The x coordinate of the mouse.
+ * @param y The y coordinate of the mouse.
+ */
+
+void CImage::onRelease(nxgl_coord_t x, nxgl_coord_t y)
+{
   redraw();
 }
 
 /**
- * Redraws the button.
+ * Redraws the image.
  *
  * @param x The x coordinate of the mouse.
  * @param y The y coordinate of the mouse.