diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-05-10 01:11:30 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-05-10 01:11:30 +1000 |
| commit | cb606359cccd09f00f27db93bb99fb06a3b49abd (patch) | |
| tree | 73ad7fd5a73ff43e3ba074a609cc2385372ee01c /src/gwin/frame.c | |
| parent | 21aac3d8532c9aa1decab30c00d9f5a37067aa13 (diff) | |
| download | uGFX-cb606359cccd09f00f27db93bb99fb06a3b49abd.tar.gz uGFX-cb606359cccd09f00f27db93bb99fb06a3b49abd.tar.bz2 uGFX-cb606359cccd09f00f27db93bb99fb06a3b49abd.zip | |
Multiple changes to GWIN to support containers.
Diffstat (limited to 'src/gwin/frame.c')
| -rw-r--r-- | src/gwin/frame.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gwin/frame.c b/src/gwin/frame.c index fbef54dc..9877b95e 100644 --- a/src/gwin/frame.c +++ b/src/gwin/frame.c @@ -190,7 +190,7 @@ static void _callbackBtn(void *param, GEvent *pe) { /////////////////////////////////////////////////////////////////////////////////////////////////// static const GColorSet* _getDrawColors(GWidgetObject *gw) { - if (!(gw->g.flags & GWIN_FLG_ENABLED)) + if (!(gw->g.flags & GWIN_FLG_SYSENABLED)) return &gw->pstyle->disabled; //if ((gw->g.flags & GBUTTON_FLG_PRESSED)) // return &gw->pstyle->pressed; @@ -213,10 +213,6 @@ void gwinFrameDraw_Std(GWidgetObject *gw, void *param) { border = HTML2COLOR(0x2698DE); background = HTML2COLOR(0xEEEEEE); - #if GDISP_NEED_CLIP - gdispGSetClip(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height); - #endif - // Render the actual frame (with border, if any) if (gw->g.flags & GWIN_FRAME_BORDER) { gdispGFillArea(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, border); |