uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

First implementation of widget focus changing using the TAB key

Browse Source
This commit is contained in:
Joel Bodenmann 2015-08-14 14:11:03 +02:00
parent e7e4f813e1
commit 9f5e19c151
1 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/gwin/gwin_widget.c
View File

@ -148,39 +148,55 @@ static void gwidgetEvent(void *param, GEvent *pe) {
case GEVENT_KEYBOARD: case GEVENT_KEYBOARD:
// If Tab key pressed then set focus to next widget // If Tab key pressed then set focus to next widget
if (pke->bytecount == 1 && pke->c[0] == GKEY_TAB) { if (pke->bytecount == 1 && pke->c[0] == GKEY_TAB) {
GHandle nextWidgetInFocus = 0;
bool_t loopCompleted = FALSE; // Get the next widget
bool_t foundWidget = FALSE;
bool_t endOfListDetected = FALSE;
GHandle nextWidget = gwinGetFocus();
do { do {
nextWidgetInFocus = gwinGetNextWindow(gwinGetFocus()); nextWidget = gwinGetNextWindow(nextWidget);
printf("0x%X\r\n", nextWidgetInFocus); foundWidget = TRUE;
// We only look out for widgets
if (!gwinIsWidget(nextWidgetInFocus)) { // Begin with the first one if this is the last one
if (nextWidget == 0) {
foundWidget = FALSE;
// We go through the list twice - just to be sure
if (endOfListDetected) {
break;
}
endOfListDetected = TRUE;
continue; continue;
} }
if (nextWidgetInFocus == 0) {
loopCompleted = TRUE;
// Restart with the first widget
nextWidgetInFocus = gwinGetNextWindow(gwinGetFocus());
}
} while (nextWidgetInFocus == 0 && loopCompleted == FALSE);
printf("0x%X\r\n", nextWidgetInFocus);
gwinSetFocus(nextWidgetInFocus);
/* // Check whether this is a window or a widget
// If it was the last widget begin with the first one again if (!gwinIsWidget(nextWidget)) {
if (widgetInFocus == 0) { foundWidget = FALSE;
widgetInFocus = gwinGetNextWindow(0); continue;
} }
*/
//printf("Got now: %s\n", gwinGetClassName(gwinGetFocus())); // Only focus on a widget that is visible and enabled
if (!(nextWidget->flags & GWIN_FLG_SYSVISIBLE) || !(nextWidget->flags & GWIN_FLG_ENABLED)) {
foundWidget = FALSE;
continue;
}
// When using the TAB key we only focus on widgets that process keyboard events
if (((gwidgetVMT*)nextWidget->vmt)->KeyboardEvent == 0) {
foundWidget = FALSE;
continue;
}
} while (foundWidget == FALSE);
gwinSetFocus(nextWidget);
break; break;
} }
/*
// Otherise, send keyboard events only to widget in focus // Otherise, send keyboard events only to widget in focus
GHandle widgetInFocus = gwinGetFocus();
if (widgetInFocus != 0) { if (widgetInFocus != 0) {
// Make sure that it is a widget // Make sure that it is a widget
if (!(widgetInFocus->flags & GWIN_FLG_WIDGET)) { if (!gwinIsWidget(widgetInFocus)) {
break; break;
} }
@ -197,7 +213,7 @@ static void gwidgetEvent(void *param, GEvent *pe) {
// If we got this far we can finally pass the event // If we got this far we can finally pass the event
((gwidgetVMT*)widgetInFocus->vmt)->KeyboardEvent((GWidgetObject*)widgetInFocus, pke); ((gwidgetVMT*)widgetInFocus->vmt)->KeyboardEvent((GWidgetObject*)widgetInFocus, pke);
} }
*/
#endif #endif
#if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE