diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-12-22 13:20:36 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-12-22 13:20:36 +1000 |
| commit | 6b70d3a63fed2956bacb97517fe1a1c86c80cd69 (patch) | |
| tree | a7d3b79f6f465e1f7b916886fc5a2a8605637941 /src | |
| parent | 184f1e0d9bc657a14d98ec9a30fd62575d014641 (diff) | |
| download | uGFX-6b70d3a63fed2956bacb97517fe1a1c86c80cd69.tar.gz uGFX-6b70d3a63fed2956bacb97517fe1a1c86c80cd69.tar.bz2 uGFX-6b70d3a63fed2956bacb97517fe1a1c86c80cd69.zip | |
Fix enabled bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/gwin/gwin_widget.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gwin/gwin_widget.c b/src/gwin/gwin_widget.c index 38c98903..2c186316 100644 --- a/src/gwin/gwin_widget.c +++ b/src/gwin/gwin_widget.c @@ -311,7 +311,7 @@ static void gwidgetEvent(void *param, GEvent *pe) { } void _gwidgetDrawFocusRect(GWidgetObject *gx, coord_t x, coord_t y, coord_t cx, coord_t cy) { - uint16_t i = 0; + uint16_t i; // Don't do anything if we don't have the focus if (&gx->g != _widgetInFocus) @@ -381,6 +381,11 @@ GHandle _gwidgetCreate(GDisplay *g, GWidgetObject *pgw, const GWidgetInit *pInit if (!(pgw = (GWidgetObject *)_gwindowCreate(g, &pgw->g, &pInit->g, &vmt->g, GWIN_FLG_WIDGET|GWIN_FLG_ENABLED|GWIN_FLG_SYSENABLED))) return 0; + #if GWIN_NEED_CONTAINERS + // This window can't be system enabled if the parent is not enabled + if (pgw->g.parent && !(pgw->g.parent->flags & GWIN_FLG_SYSENABLED)) + pgw->g.flags &= ~GWIN_FLG_SYSENABLED; + #endif pgw->text = pInit->text ? pInit->text : ""; pgw->fnDraw = pInit->customDraw ? pInit->customDraw : vmt->DefaultDraw; pgw->fnParam = pInit->customParam; |