diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-07-06 14:24:40 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-07-06 14:24:40 +0200 |
| commit | f2432096cd823bb781d0574492b47c71bd340e1a (patch) | |
| tree | be2c2b4f43250680f0efc6c94e3408923a52b424 /demos/modules/gwin/widgets/main.c | |
| parent | 5191c278e7195de62b619be58c19ea338c31d54c (diff) | |
| download | uGFX-f2432096cd823bb781d0574492b47c71bd340e1a.tar.gz uGFX-f2432096cd823bb781d0574492b47c71bd340e1a.tar.bz2 uGFX-f2432096cd823bb781d0574492b47c71bd340e1a.zip | |
added GWIN image demo
Diffstat (limited to 'demos/modules/gwin/widgets/main.c')
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index e44ce6b0..e0e4c401 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -28,6 +28,9 @@ #include "gfx.h" +// include our chibios logo in a .gif format +#include "image_chibios.h" + static GListener gl; static GHandle ghConsole; static GHandle ghTabButtons, ghTabSliders, ghTabCheckboxes, ghTabLabels, ghTabRadios, ghTabImages; @@ -36,7 +39,7 @@ static GHandle ghSlider1, ghSlider2, ghSlider3, ghSlider4; static GHandle ghCheckbox1, ghCheckbox2; static GHandle ghLabel1; static GHandle ghRadio1, ghRadio2; -//static GHandle ghImage1; +static GHandle ghImage1; #define ScrWidth gdispGetWidth() #define ScrHeight gdispGetHeight() @@ -127,6 +130,12 @@ int main(void) { wi.g.x = 0*wi.g.width; wi.text = "Yes"; ghRadio1 = gwinCreateRadio(NULL, &wi, GROUP_R1R2); wi.g.x = 1*wi.g.width; wi.text = "No"; ghRadio2 = gwinCreateRadio(NULL, &wi, GROUP_R1R2); + // Image + wi.g.x = ScrWidth-210; wi.g.y = TAB_HEIGHT + 10; wi.g.width = 200; wi.g.height = 200; + ghImage1 = gwinImageCreate(NULL, &wi); + gwinImageOpenMemory(ghImage1, image_chibios); + gwinImageCache(ghImage1); + // Console - we apply some special colors before making it visible wi.g.width = ScrWidth/2-1; wi.g.height = ScrHeight/2-1; wi.g.x = ScrWidth/2+1; wi.g.y = ScrHeight/2+1; @@ -192,7 +201,7 @@ int main(void) { gwinSetVisible(ghLabel1, ((GEventGWinRadio *)pe)->radio == ghTabLabels); gwinSetVisible(ghRadio1, ((GEventGWinRadio *)pe)->radio == ghTabRadios); gwinSetVisible(ghRadio2, ((GEventGWinRadio *)pe)->radio == ghTabRadios); - //gwinSetVisible(ghImage1, ((GEventGWinRadio *)pe)->radio == ghTabImages); + gwinSetVisible(ghImage1, ((GEventGWinRadio *)pe)->radio == ghTabImages); // Do some special animation for Label1 if (((GEventGWinRadio *)pe)->radio == ghTabLabels) { |