diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-13 01:00:10 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-13 01:00:10 +1000 |
| commit | 10c7471149453cea6686aa6f61ec6dac0525c47b (patch) | |
| tree | 11c872b10ad42872de3d44d7fec3aa5388ee90e4 /src/gwin/gwin_button.c | |
| parent | ddf79cd411e2cbdb58c485851b16be496109ab3b (diff) | |
| parent | 5cf81b6fbe76cd5decab8e532fd607202abbc6c6 (diff) | |
| download | uGFX-10c7471149453cea6686aa6f61ec6dac0525c47b.tar.gz uGFX-10c7471149453cea6686aa6f61ec6dac0525c47b.tar.bz2 uGFX-10c7471149453cea6686aa6f61ec6dac0525c47b.zip | |
Merge branch 'TextEdit'
Diffstat (limited to 'src/gwin/gwin_button.c')
| -rw-r--r-- | src/gwin/gwin_button.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/gwin/gwin_button.c b/src/gwin/gwin_button.c index 4066884c..4d83348e 100644 --- a/src/gwin/gwin_button.c +++ b/src/gwin/gwin_button.c @@ -50,6 +50,24 @@ } #endif +#if GINPUT_NEED_KEYBOARD || GWIN_NEED_KEYBOARD + static void ButtonKeyboard(GWidgetObject* gw, GEventKeyboard* pke) + { + // ENTER and SPACE keys to press the button + if (pke->c[0] == GKEY_ENTER || pke->c[0] == GKEY_SPACE) { + + // Press or release event? + if (pke->keystate & GKEYSTATE_KEYUP) { + gw->g.flags &= ~GBUTTON_FLG_PRESSED; + } else { + gw->g.flags |= GBUTTON_FLG_PRESSED; + } + } + + _gwinUpdate((GHandle)gw); + } +#endif + #if GINPUT_NEED_TOGGLE // A toggle off has occurred static void ButtonToggleOff(GWidgetObject *gw, uint16_t role) { @@ -95,6 +113,11 @@ static const gwidgetVMT buttonVMT = { 0, // Process mouse move events (NOT USED) }, #endif + #if GINPUT_NEED_KEYBOARD || GWIN_NEED_KEYBOARD + { + ButtonKeyboard // Process keyboard events + }, + #endif #if GINPUT_NEED_TOGGLE { 1, // 1 toggle role |