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/label.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/label.c')
| -rw-r--r-- | src/gwin/label.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gwin/label.c b/src/gwin/label.c index 2aa0c860..ffb9fa3d 100644 --- a/src/gwin/label.c +++ b/src/gwin/label.c @@ -147,7 +147,7 @@ static void gwinLabelDefaultDraw(GWidgetObject *gw, void *param) { w = (gw->g.flags & GLABEL_FLG_WAUTO) ? getwidth(gw->text, gw->g.font, gdispGGetWidth(gw->g.display) - gw->g.x) : gw->g.width; h = (gw->g.flags & GLABEL_FLG_HAUTO) ? getheight(gw->text, gw->g.font, gdispGGetWidth(gw->g.display) - gw->g.x) : gw->g.height; - c = (gw->g.flags & GWIN_FLG_ENABLED) ? gw->pstyle->enabled.text : gw->pstyle->disabled.text; + c = (gw->g.flags & GWIN_FLG_SYSENABLED) ? gw->pstyle->enabled.text : gw->pstyle->disabled.text; if (gw->g.width != w || gw->g.height != h) { gwinResize(&gw->g, w, h); @@ -167,7 +167,7 @@ static void gwinLabelDefaultDraw(GWidgetObject *gw, void *param) { // render the border (if any) if (gw->g.flags & GLABEL_FLG_BORDER) - gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, w, h, (gw->g.flags & GWIN_FLG_ENABLED) ? gw->pstyle->enabled.edge : gw->pstyle->disabled.edge); + gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, w, h, (gw->g.flags & GWIN_FLG_SYSENABLED) ? gw->pstyle->enabled.edge : gw->pstyle->disabled.edge); } #endif // GFX_USE_GWIN && GFX_NEED_LABEL |