From 49c5300ccd2700a5e812da540c91d238c953b07b Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 19 Oct 2015 07:24:30 +0200 Subject: Fixing checkbox keyboard handler --- src/gwin/gwin_checkbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gwin/gwin_checkbox.c') diff --git a/src/gwin/gwin_checkbox.c b/src/gwin/gwin_checkbox.c index d477420b..78066567 100644 --- a/src/gwin/gwin_checkbox.c +++ b/src/gwin/gwin_checkbox.c @@ -60,7 +60,7 @@ static void SendCheckboxEvent(GWidgetObject *gw) { { // Only react on KEYDOWN events. Ignore KEYUP events. if (pke->keystate & GKEYSTATE_KEYUP) { - break; + return; } // ENTER and SPACE keys to check/uncheck the checkbox -- cgit v1.2.3 From 3d618f8a7a55683c587399699891bb5a6880a0d3 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 19 Oct 2015 10:07:05 +0200 Subject: Adding boarder highlight if focused to checkbox widget --- src/gwin/gwin_checkbox.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/gwin/gwin_checkbox.c') diff --git a/src/gwin/gwin_checkbox.c b/src/gwin/gwin_checkbox.c index 78066567..e0115608 100644 --- a/src/gwin/gwin_checkbox.c +++ b/src/gwin/gwin_checkbox.c @@ -196,6 +196,9 @@ void gwinCheckboxDraw_CheckOnLeft(GWidgetObject *gw, void *param) { if (gw->g.flags & GCHECKBOX_FLG_CHECKED) gdispGFillArea(gw->g.display, gw->g.x+df, gw->g.y+df, ld-2*df, ld-2*df, pcol->fill); + // Render highlighted border if focused + _gwidgetDrawFocusRect(gw, 1, 1, ld-2, ld-2); + // Draw the text gdispGFillStringBox(gw->g.display, gw->g.x+ld+1, gw->g.y, gw->g.width-ld-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, justifyLeft); #undef gcw @@ -225,6 +228,9 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) { if (gw->g.flags & GCHECKBOX_FLG_CHECKED) gdispGFillArea(gw->g.display, gw->g.x+ep+df, gw->g.y+df, ld-2*df, ld-2*df, pcol->fill); + // Render highlighted border if focused + _gwidgetDrawFocusRect(gw, ep+1, 1, ld-2, ld-2); + // Draw the text gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, ep-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, justifyRight); #undef gcw -- cgit v1.2.3