diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 12:18:27 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 12:18:27 +1000 |
commit | ecaf8b83f8227724e9f862a0a8f64e6004a63d56 (patch) | |
tree | ed84213400a1f7e338e5bb79eb5fec11152e24d1 /demos/modules/gwin/frame | |
parent | 3b21507274aa4f98644382903ae529c1fc2c7bd4 (diff) | |
download | uGFX-ecaf8b83f8227724e9f862a0a8f64e6004a63d56.tar.gz uGFX-ecaf8b83f8227724e9f862a0a8f64e6004a63d56.tar.bz2 uGFX-ecaf8b83f8227724e9f862a0a8f64e6004a63d56.zip |
Create a generic GWIN event.
The frame now sends a GEVENT_GWIN_CLOSE event on closing.
Unfortunately some gwin events have had a field renamed in order to generalise the structure.
Demo's updated to match.
Diffstat (limited to 'demos/modules/gwin/frame')
-rw-r--r-- | demos/modules/gwin/frame/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c index 3f3d8845..fe956925 100644 --- a/demos/modules/gwin/frame/main.c +++ b/demos/modules/gwin/frame/main.c @@ -138,19 +138,19 @@ int main(void) { switch(pe->type) { case GEVENT_GWIN_SLIDER: - if (((GEventGWinSlider *)pe)->slider == ghSliderR || \ - ghSliderG || \ - ghSliderB ) { + if (((GEventGWinSlider *)pe)->gwin == ghSliderR || \ + ghSliderG || \ + ghSliderB ) { _updateColor(); } break; case GEVENT_GWIN_BUTTON: - if (((GEventGWinButton *)pe)->button == ghButton1) { + if (((GEventGWinButton *)pe)->gwin == ghButton1) { gwinSliderSetPosition(ghSliderR, rand() % 256); - } else if (((GEventGWinButton *)pe)->button == ghButton2) { + } else if (((GEventGWinButton *)pe)->gwin == ghButton2) { gwinSliderSetPosition(ghSliderG, rand() % 256); - } else if (((GEventGWinButton *)pe)->button == ghButton3) { + } else if (((GEventGWinButton *)pe)->gwin == ghButton3) { gwinSliderSetPosition(ghSliderB, rand() % 256); } |