uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Move GWIN widget internal flags into the public header so that all the state flags are available for custom draw routines.

Browse source
This commit is contained in:
Joel Bodenmann 2016-02-18 00:17:38 +01:00
parent 7b6a1acea5
commit 3a840480ed
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gwin/gwin_button.h
View file

@ -44,7 +44,7 @@ typedef GEventGWin GEventGWinButton;
* @note Used only for writing a custom draw routine.
* @{
*/
#define GBUTTON_FLG_PRESSED (GWIN_FIRST_CONTROL_FLAG<<0)
#define GBUTTON_FLG_PRESSED (0x00000001<<0)
/** @} */
/**

2
src/gwin/gwin_checkbox.h
View file

@ -50,7 +50,7 @@ typedef struct GEventGWinCheckbox {
* @note Used only for writing a custom draw routine.
* @{
*/
#define GCHECKBOX_FLG_CHECKED (GWIN_FIRST_CONTROL_FLAG<<0)
#define GCHECKBOX_FLG_CHECKED (0x00000001<<0)
/** @} */
/* A Checkbox window */

2
src/gwin/gwin_class.h
View file

@ -27,7 +27,7 @@
* @brief The predefined flags for a Window
* @{
*/
#define GWIN_FIRST_CONTROL_FLAG 0x00000001 /**< 8 bits free for the control to use */
#define GWIN_FIRST_CONTROL_FLAG 0x00000001 /**< 8 bits free for the control to use. Don't change this value as it is relied upon definitions in widget header files. */
#define GWIN_LAST_CONTROL_FLAG 0x00000080 /**< 8 bits free for the control to use */
#define GWIN_FLG_VISIBLE 0x00000100 /**< The window is "visible" */
#define GWIN_FLG_SYSVISIBLE 0x00000200 /**< The window is visible after parents are tested */

4
src/gwin/gwin_keyboard.h
View file

@ -44,8 +44,8 @@ typedef GEventGWin GEventGWinKeyboard;
* @note Used only for writing a custom draw routine.
* @{
*/
#define GKEYBOARD_FLG_REVERTSET (GWIN_FIRST_CONTROL_FLAG<<0)
#define GKEYBOARD_FLG_QUICKUPDATE (GWIN_FIRST_CONTROL_FLAG<<1)
#define GKEYBOARD_FLG_REVERTSET (0x00000001<<0)
#define GKEYBOARD_FLG_QUICKUPDATE (0x00000001<<1)
#define GKEY_BAD_ROWCOL 255
/** @} */

6
src/gwin/gwin_label.h
View file

@ -38,9 +38,9 @@
* @note Used only for writing a custom draw routine.
* @{
*/
#define GLABEL_FLG_WAUTO (GWIN_FIRST_CONTROL_FLAG << 0)
#define GLABEL_FLG_HAUTO (GWIN_FIRST_CONTROL_FLAG << 1)
#define GLABEL_FLG_BORDER (GWIN_FIRST_CONTROL_FLAG << 2)
#define GLABEL_FLG_WAUTO (0x00000001 << 0)
#define GLABEL_FLG_HAUTO (0x00000001 << 1)
#define GLABEL_FLG_BORDER (0x00000001 << 2)
/** @} */
// An label window

10
src/gwin/gwin_list.h
View file

@ -81,11 +81,11 @@ typedef enum scroll_t { scrollAlways, scrollAuto, scrollSmooth } scroll_t;
* @note Used only for writing a custom draw routine.
* @{
*/
#define GLIST_FLG_MULTISELECT (GWIN_FIRST_CONTROL_FLAG << 0)
#define GLIST_FLG_HASIMAGES (GWIN_FIRST_CONTROL_FLAG << 1)
#define GLIST_FLG_SCROLLALWAYS (GWIN_FIRST_CONTROL_FLAG << 2)
#define GLIST_FLG_SCROLLSMOOTH (GWIN_FIRST_CONTROL_FLAG << 3)
#define GLIST_FLG_ENABLERENDER (GWIN_FIRST_CONTROL_FLAG << 4)
#define GLIST_FLG_MULTISELECT (0x00000001 << 0)
#define GLIST_FLG_HASIMAGES (0x00000001 << 1)
#define GLIST_FLG_SCROLLALWAYS (0x00000001 << 2)
#define GLIST_FLG_SCROLLSMOOTH (0x00000001 << 3)
#define GLIST_FLG_ENABLERENDER (0x00000001 << 4)
/** @} */
/**

2
src/gwin/gwin_radio.h
View file

@ -50,7 +50,7 @@ typedef struct GEventGWinRadio {
* @note Used only for writing a custom draw routine.
* @{
*/
#define GRADIO_FLG_PRESSED (GWIN_FIRST_CONTROL_FLAG<<0)
#define GRADIO_FLG_PRESSED (0x00000001<<0)
/** @} */
/**

2
src/gwin/gwin_slider.h
View file

@ -50,7 +50,7 @@ typedef struct GEventGWinSlider {
* @note Used only for writing a custom draw routine.
* @{
*/
#define GSLIDER_FLG_EXTENDED_EVENTS (GWIN_FIRST_CONTROL_FLAG<<0)
#define GSLIDER_FLG_EXTENDED_EVENTS (0x00000001<<0)
/** @} */
// A slider window