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

Added missing check for GDISP_NEED_CIRCLE

Browse Source
This commit is contained in:
Steffen Schroeter 2018-01-23 14:05:11 +01:00
parent e0f22d9cb8
commit c119ca4a5d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gwin/gwin_class.h
View File

@ -371,7 +371,9 @@ bool_t _gwinWMAdd(GHandle gh, const GWindowInit *pInit);
* *
* @notapi * @notapi
*/ */
void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius); #if GDISP_NEED_CIRCLE
void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius);
#endif
#else #else
#define _gwinFixFocus(gh) #define _gwinFixFocus(gh)

20
src/gwin/gwin_widget.c
View File

@ -330,17 +330,19 @@ static void gwidgetEvent(void *param, GEvent *pe) {
} }
} }
void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius) { #if GDISP_NEED_CIRCLE
coord_t i; void _gwidgetDrawFocusCircle(GWidgetObject *gx, coord_t radius) {
coord_t i;
// Don't do anything if we don't have the focus // Don't do anything if we don't have the focus
if (&gx->g != _widgetInFocus) if (&gx->g != _widgetInFocus)
return; return;
for (i = 0; i < GWIN_FOCUS_HIGHLIGHT_WIDTH; i++) { 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); gdispGDrawCircle(gx->g.display, gx->g.x + radius, gx->g.y + radius, radius + i, gx->pstyle->focus);
}
} }
} #endif
#endif #endif
#if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE