diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-12 16:45:06 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-12 16:45:06 +1000 |
| commit | 5460a923ab25d27e522fe175563633665c477e02 (patch) | |
| tree | e43734965f66092d3d076a599b3b8a188b005bc0 /src/gwin/gcontainer.c | |
| parent | 0e74c164c3eac14f6e99d1a5cc4e0563faeff5d0 (diff) | |
| parent | 10902154aec652a3fcdf028b2c6ff16743464973 (diff) | |
| download | uGFX-5460a923ab25d27e522fe175563633665c477e02.tar.gz uGFX-5460a923ab25d27e522fe175563633665c477e02.tar.bz2 uGFX-5460a923ab25d27e522fe175563633665c477e02.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'src/gwin/gcontainer.c')
| -rw-r--r-- | src/gwin/gcontainer.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gwin/gcontainer.c b/src/gwin/gcontainer.c index 46e89032..2d711ffd 100644 --- a/src/gwin/gcontainer.c +++ b/src/gwin/gcontainer.c @@ -93,11 +93,14 @@ coord_t gwinGetInnerHeight(GHandle gh) { static coord_t BorderSize(GHandle gh) { return (gh->flags & GWIN_CONTAINER_BORDER) ? 2 : 0; } static void DrawSimpleContainer(GWidgetObject *gw, void *param) { - (void) param; - gdispGFillArea(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, gw->pstyle->background); - if ((gw->g.flags & GWIN_CONTAINER_BORDER)) - gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, (gw->g.flags & GWIN_FLG_SYSENABLED) ? gw->pstyle->enabled.edge : gw->pstyle->disabled.edge); -} + (void)param; + + if (!(gw->g.flags & GWIN_CONTAINER_TRANSPARENT)) + gdispGFillArea(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, gw->pstyle->background); + + if ((gw->g.flags & GWIN_CONTAINER_BORDER)) + gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, (gw->g.flags & GWIN_FLG_SYSENABLED) ? gw->pstyle->enabled.edge : gw->pstyle->disabled.edge); +} // The container VMT table static const gcontainerVMT containerVMT = { |