sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Squashed commit of the following:

Browse Source 
apps/graphics/nxwidgets/src/cbuttonarray.cxx:  Correct an error CButtonArray.  Was not correctly resizing the widget when the dimensions of the button array changed.

    apps/graphics/twm4nx:  Trival correcion of some typos in comments.
This commit is contained in:
Gregory Nutt 2019-05-15 07:55:57 -06:00
parent 7d28294b45
commit e6b642308f
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/nxwidgets/src/cbuttonarray.cxx
View File

@ -166,14 +166,19 @@ bool CButtonArray::resizeArray(uint8_t buttonColumns, uint8_t buttonRows,
// Allocate the new text array
m_buttonText = new CNxString[m_buttonRows * m_buttonColumns];
m_buttonText = new CNxString[m_buttonRows * m_buttonColumns];
// Resize the widget
bool success = resize(buttonColumns * buttonWidth + 2,
buttonRows * buttonHeight + 2);
// And go active again with a resized button array (with no labels)
enableDrawing();
redraw();
setRaisesEvents(true);
return true;
return success;
}
/**

6
graphics/twm4nx/src/cwindow.cxx
View File

@ -1440,14 +1440,14 @@ void CWindow::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
}
/**
* This function is called when there is any moved of the mouse or
* This function is called when there is any movement of the mouse or
* touch position that would indicate that the object is being moved.
*
* This function overrides the virtual IEventTap::moveEvent method.
*
* @param pos The current mouse/touch X/Y position in toolbar relative
* coordinates.
* @return True: if the drag event was processed; false it is was
* @return True: if the drag event was processed; false it was
* ignored. The event should be ignored if there is not actually
* a drag event in progress
*/
@ -1507,7 +1507,7 @@ bool CWindow::moveEvent(FAR const struct nxgl_point_s &pos,
*
* @param pos The last mouse/touch X/Y position in toolbar relative
* coordinates.
* @return True: If the drag event was processed; false it is was
* @return True: If the drag event was processed; false it was
* ignored. The event should be ignored if there is not actually
* a drag event in progress
*/

4
include/graphics/twm4nx/cwindow.hxx
View File

@ -297,7 +297,7 @@ namespace Twm4Nx
*
* @param pos The current mouse/touch X/Y position.
* @param arg The user-argument provided that accompanies the callback
* @return True: if the movement event was processed; false it is was
* @return True: if the movement event was processed; false it was
* ignored. The event should be ignored if there is not actually
* a movement event in progress
*/
@ -314,7 +314,7 @@ namespace Twm4Nx
*
* @param pos The last mouse/touch X/Y position.
* @param arg The user-argument provided that accompanies the callback
* @return True: if the drop event was processed; false it is was
* @return True: if the drop event was processed; false it was
* ignored. The event should be ignored if there is not actually
* a movement event in progress
*/

4
include/graphics/twm4nx/cwindowevent.hxx
View File

@ -99,7 +99,7 @@ namespace Twm4Nx
* @param pos The current mouse/touch X/Y position in toolbar relative
* coordinates.
* @param arg The user-argument provided that accompanies the callback
* @return True: if the movement event was processed; false it is was
* @return True: if the movement event was processed; false it was
* ignored. The event should be ignored if there is not actually
* a movement event in progress
*/
@ -115,7 +115,7 @@ namespace Twm4Nx
* @param pos The last mouse/touch X/Y position in toolbar relative
* coordinates.
* @param arg The user-argument provided that accompanies the callback
* @return True: If the movement event was processed; false it is was
* @return True: If the movement event was processed; false it was
* ignored. The event should be ignored if there is not actually
* a movement event in progress
*/