diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-17 00:54:37 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-17 00:54:37 +1000 |
| commit | c06bff3304ed234c3a7f96fd049755ac59228ef7 (patch) | |
| tree | 43d2494dcae6667654d76fa581070eac9e2a54b8 /demos | |
| parent | 5460a923ab25d27e522fe175563633665c477e02 (diff) | |
| parent | 14075df6989eed0c60f34ac3eeee37ff002b0db8 (diff) | |
| download | uGFX-c06bff3304ed234c3a7f96fd049755ac59228ef7.tar.gz uGFX-c06bff3304ed234c3a7f96fd049755ac59228ef7.tar.bz2 uGFX-c06bff3304ed234c3a7f96fd049755ac59228ef7.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gwin/frame/gfxconf.h | 1 | ||||
| -rw-r--r-- | demos/modules/gwin/frame/main.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/demos/modules/gwin/frame/gfxconf.h b/demos/modules/gwin/frame/gfxconf.h index 08a01b73..c6dcd80f 100644 --- a/demos/modules/gwin/frame/gfxconf.h +++ b/demos/modules/gwin/frame/gfxconf.h @@ -46,6 +46,7 @@ #define GWIN_NEED_WINDOWMANAGER TRUE #define GWIN_NEED_WIDGET TRUE + #define GWIN_NEED_LABEL TRUE #define GWIN_NEED_BUTTON TRUE #define GWIN_NEED_SLIDER TRUE #define GWIN_NEED_CONTAINERS TRUE diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c index 2acf901c..3f3d8845 100644 --- a/demos/modules/gwin/frame/main.c +++ b/demos/modules/gwin/frame/main.c @@ -25,6 +25,14 @@ static void _createWidgets(void) { gwinWidgetClearInit(&wi); wi.g.show = TRUE; + // Create a surprise label behind the frame window + wi.g.width = 100; + wi.g.height = 20; + wi.g.y = 100; + wi.g.x = 150; + wi.text = "Surprise!"; + gwinLabelCreate(0, &wi); + // Apply the frame parameters wi.g.width = 300; wi.g.height = 200; |