diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-04-27 16:24:13 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-04-27 16:24:13 +0200 |
| commit | 85dd732c2b78dabfe4edf4f74c3a82fccd42275c (patch) | |
| tree | 9144492b57a281855cf721faf03e41ae6f5e9392 /demos/modules/gwin/widgets/main.c | |
| parent | 43a143588c8c62ab1474b896d5afd6c2bf11a8f3 (diff) | |
| parent | 8b4ca720369d790ea330bc2189efa05cc557c2f7 (diff) | |
| download | uGFX-85dd732c2b78dabfe4edf4f74c3a82fccd42275c.tar.gz uGFX-85dd732c2b78dabfe4edf4f74c3a82fccd42275c.tar.bz2 uGFX-85dd732c2b78dabfe4edf4f74c3a82fccd42275c.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'demos/modules/gwin/widgets/main.c')
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index a9840174..c0c26776 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -256,10 +256,9 @@ static void createWidgets(void) { gwinListSetScroll(ghList4, scrollSmooth); // Image - wi.g.x = ScrWidth-210; wi.g.y = 2*TAB_HEIGHT + 10; wi.g.width = 200; wi.g.height = 200; + wi.g.x = 20; wi.g.y = 2*TAB_HEIGHT+20; wi.g.width = 200; wi.g.height = 100; ghImage1 = gwinImageCreate(0, &wi.g); - gwinImageOpenFile(ghImage1, "chibios.bmp"); - gwinImageCache(ghImage1); + gwinImageOpenFile(ghImage1, "romfs_img_ugfx.bmp"); // Progressbar wi.g.show = FALSE; wi.customDraw = 0; @@ -373,6 +372,7 @@ static void setEnabled(bool_t ena) { gwinSetEnabled(ghRadioBlack, ena); gwinSetEnabled(ghRadioYellow, ena); gwinSetEnabled(ghImage1, ena); + gwinSetEnabled(ghProgressbar1, ena); } int main(void) { |