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

Several patches from Petteri Aimonen

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5625 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-02-08 15:28:07 +00:00
parent 51d056fa13
commit 1e8e94837c
6 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.txt
View File

@ -270,4 +270,12 @@
1.6 2013-xx-xx Gregory Nutt <gnutt@nuttx.org>
* Type of argv[] has changed from const char ** to char * const *
* NXWidgets::CNxWidget: Add an inline function to get the current style.
* NxWM::CTaskBar: Make a some methods of CTaskbar virtual to allow
customizations. From Petteri Aimonen.
* NXWidgets::CCycleButton: Make CCycleButton change state in onPreRelease().
This way the new value is already available when a listener gets the
action event. From Petteri Aimonen.
* NxWidgets/tools/bitmap_converter.py: Fix bitmap_converter.py so that
it works with indexed input images.

2
libnxwidgets/include/ccyclebutton.hxx
View File

@ -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.

7
libnxwidgets/include/cnxwidget.hxx
View File

@ -796,6 +796,13 @@ namespace NXWidgets
return m_style.colors.selectedText;
}
/**
* 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.
*

4
libnxwidgets/src/ccyclebutton.cxx
View File

@ -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);
}
/**

16
nxwm/include/ctaskbar.hxx
View File

@ -83,9 +83,9 @@ namespace NxWM
*/
class CTaskbar : public NXWidgets::CNxServer,
private NXWidgets::CWidgetEventHandler
protected NXWidgets::CWidgetEventHandler
{
private:
protected:
/**
* This structure represents an application and its associated icon image
*/
@ -152,7 +152,7 @@ namespace NxWM
* @return true on success
*/
bool createTaskbarWindow(void);
virtual bool createTaskbarWindow(void);
/**
* Create the background window.
@ -160,7 +160,7 @@ namespace NxWM
* @return true on success
*/
bool createBackgroundWindow(void);
virtual bool createBackgroundWindow(void);
/**
* Create the background image.
@ -168,7 +168,7 @@ namespace NxWM
* @return true on success
*/
bool createBackgroundImage(void);
virtual bool createBackgroundImage(void);
/**
* (Re-)draw the task bar window.
@ -176,7 +176,7 @@ namespace NxWM
* @return true on success
*/
bool redrawTaskbarWindow(void);
virtual bool redrawTaskbarWindow(void);
/**
* Redraw the window at the top of the heirarchy.
@ -184,7 +184,7 @@ namespace NxWM
* @return true on success
*/
bool redrawTopApplication(void);
virtual bool redrawTopApplication(void);
/**
* Raise the top window to the top of the NXheirarchy.
@ -200,7 +200,7 @@ namespace NxWM
* @return true on success
*/
bool redrawBackgroundWindow(void);
virtual bool redrawBackgroundWindow(void);
/**
* Redraw the last application in the list of application maintained by

2
tools/bitmap_converter.py
View File

@ -121,7 +121,7 @@ if __name__ == '__main__':
print "Usage: bitmap_converter.py source.png output.cxx"
sys.exit(1)
img = Image.open(sys.argv[1])
img = Image.open(sys.argv[1]).convert("RGB")
outfile = open(sys.argv[2], 'w')
palette = get_palette(img)