diff options
| author | Steffen Schroeter <steffen@vexar.de> | 2018-01-23 14:05:11 +0100 |
|---|---|---|
| committer | Steffen Schroeter <steffen@vexar.de> | 2018-01-23 14:05:11 +0100 |
| commit | c119ca4a5dd8df57d39a57a530cc5b01adf699e8 (patch) | |
| tree | 920b6083b844f83f56fe27e029bb4b8163f3b2b1 | |
| parent | e0f22d9cb8990c6535d0bac0de8143eb1b3b1b2f (diff) | |
| download | uGFX-c119ca4a5dd8df57d39a57a530cc5b01adf699e8.tar.gz uGFX-c119ca4a5dd8df57d39a57a530cc5b01adf699e8.tar.bz2 uGFX-c119ca4a5dd8df57d39a57a530cc5b01adf699e8.zip | |
Added missing check for GDISP_NEED_CIRCLE
| -rw-r--r-- | src/gwin/gwin_class.h | 4 | ||||
| -rw-r--r-- | src/gwin/gwin_widget.c | 20 |
2 files changed, 14 insertions, 10 deletions
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
|