From c119ca4a5dd8df57d39a57a530cc5b01adf699e8 Mon Sep 17 00:00:00 2001 From: Steffen Schroeter Date: Tue, 23 Jan 2018 14:05:11 +0100 Subject: Added missing check for GDISP_NEED_CIRCLE --- src/gwin/gwin_class.h | 4 +++- src/gwin/gwin_widget.c | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/gwin/gwin_class.h b/src/gwin/gwin_class.h index 454c13ff..4b173e3c 100644 --- a/src/gwin/gwin_class.h +++ b/src/gwin/gwin_class.h @@ -371,7 +371,9 @@ bool_t _gwinWMAdd(GHandle gh, const GWindowInit *pInit); * * @notapi */ - void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius); + #if GDISP_NEED_CIRCLE + void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius); + #endif #else #define _gwinFixFocus(gh) diff --git a/src/gwin/gwin_widget.c b/src/gwin/gwin_widget.c index 52ad90ad..38b4e236 100644 --- a/src/gwin/gwin_widget.c +++ b/src/gwin/gwin_widget.c @@ -330,17 +330,19 @@ static void gwidgetEvent(void *param, GEvent *pe) { } } - void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius) { - coord_t i; + #if GDISP_NEED_CIRCLE + void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius) { + coord_t i; - // Don't do anything if we don't have the focus - if (&gx->g != _widgetInFocus) - return; - - for (i = 0; i < GWIN_FOCUS_HIGHLIGHT_WIDTH; i++) { - gdispGDrawCircle(gx->g.display, gx->g.x + radius, gx->g.y + radius, radius + i, gx->pstyle->focus); + // Don't do anything if we don't have the focus + if (&gx->g != _widgetInFocus) + return; + + for (i = 0; i < GWIN_FOCUS_HIGHLIGHT_WIDTH; i++) { + gdispGDrawCircle(gx->g.display, gx->g.x + radius, gx->g.y + radius, radius + i, gx->pstyle->focus); + } } - } + #endif #endif #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE -- cgit v1.2.3