diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-08-16 21:53:47 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-08-16 21:53:47 +1000 |
| commit | 15e7342fd7b21b76a565561a3caafee394e70c88 (patch) | |
| tree | aeb6898cfdbcb875f4b109d202f2b4560df42021 /demos | |
| parent | 377fe644d1233e955dfd05e40fa9d335447de325 (diff) | |
| download | uGFX-15e7342fd7b21b76a565561a3caafee394e70c88.tar.gz uGFX-15e7342fd7b21b76a565561a3caafee394e70c88.tar.bz2 uGFX-15e7342fd7b21b76a565561a3caafee394e70c88.zip | |
Updates to focus.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gwin/textedit/gfxconf.h | 8 | ||||
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/demos/modules/gwin/textedit/gfxconf.h b/demos/modules/gwin/textedit/gfxconf.h index 4e518774..3c5d7b96 100644 --- a/demos/modules/gwin/textedit/gfxconf.h +++ b/demos/modules/gwin/textedit/gfxconf.h @@ -48,13 +48,15 @@ #define GDISP_NEED_CLIP TRUE #define GDISP_NEED_TEXT TRUE #define GDISP_NEED_TEXT_KERNING TRUE -#define GDISP_NEED_STARTUP_LOGO TRUE +#define GDISP_NEED_MULTITHREAD TRUE /* GDISP fonts to include */ #define GDISP_INCLUDE_FONT_UI2 TRUE #define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE /* Features for the GWIN subsystem. */ +#define GWIN_NEED_WINDOWMANAGER TRUE +#define GWIN_NEED_WIDGET TRUE #define GWIN_NEED_CONSOLE TRUE #define GWIN_NEED_TEXTEDIT TRUE #define GWIN_NEED_BUTTON TRUE @@ -63,5 +65,9 @@ #define GINPUT_NEED_MOUSE TRUE #define GINPUT_NEED_KEYBOARD TRUE +/* Features for the GQUEUE subsystem. */ +#define GFX_USE_GQUEUE TRUE +#define GQUEUE_NEED_ASYNC TRUE + #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index d5bfb6d2..8f5a6329 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -49,13 +49,14 @@ /* Our custom yellow style */ static const GWidgetStyle YellowWidgetStyle = { Yellow, // window background + HTML2COLOR(0x800000), // focus // enabled color set { HTML2COLOR(0x0000FF), // text HTML2COLOR(0x404040), // edge HTML2COLOR(0xE0E0E0), // fill - HTML2COLOR(0xE0E0E0), // progress - inactive area + HTML2COLOR(0xE0E0E0) // progress - inactive area }, // disabled color set @@ -63,7 +64,7 @@ static const GWidgetStyle YellowWidgetStyle = { HTML2COLOR(0xC0C0C0), // text HTML2COLOR(0x808080), // edge HTML2COLOR(0xE0E0E0), // fill - HTML2COLOR(0xC0E0C0), // progress - active area + HTML2COLOR(0xC0E0C0) // progress - active area }, // pressed color set @@ -72,7 +73,7 @@ static const GWidgetStyle YellowWidgetStyle = { HTML2COLOR(0x404040), // edge HTML2COLOR(0x808080), // fill HTML2COLOR(0x00E000), // progress - active area - }, + } }; /* The variables we need */ |