diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-10-24 04:31:31 +0200 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-10-24 11:22:36 +1000 |
| commit | 825bbf26a1bf11d7148a16229f6515fae5efb276 (patch) | |
| tree | ff5bce0df0d60865522daf3744a6626ee1050208 /src | |
| parent | 248335c513fe92d1629f2c34c5777ef9b628d09e (diff) | |
| download | uGFX-825bbf26a1bf11d7148a16229f6515fae5efb276.tar.gz uGFX-825bbf26a1bf11d7148a16229f6515fae5efb276.tar.bz2 uGFX-825bbf26a1bf11d7148a16229f6515fae5efb276.zip | |
fixed label bugs
Diffstat (limited to 'src')
| -rw-r--r-- | src/gwin/label.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gwin/label.c b/src/gwin/label.c index 750cb4fb..65afff7e 100644 --- a/src/gwin/label.c +++ b/src/gwin/label.c @@ -64,7 +64,7 @@ static void gwinLabelDefaultDraw(GWidgetObject *gw, void *param) { // render the border (if any) if (gw->g.flags & GLABEL_FLG_BORDER) - gdispDrawBox(gw->g.x, gw->g.y, gw->g.width, gw->g.height, (gw->g.flags & GWIN_FLG_ENABLED) ? gw->pstyle->enabled.text : gw->pstyle->disabled.text); + gdispDrawBox(gw->g.x, gw->g.y, gw->g.width, gw->g.height, (gw->g.flags & GWIN_FLG_ENABLED) ? gw->pstyle->enabled.edge : gw->pstyle->disabled.edge); } static const gwidgetVMT labelVMT = { @@ -122,8 +122,9 @@ GHandle gwinLabelCreate(GLabelObject *widget, GWidgetInit *pInit) { return 0; // no borders by default - widget->w.g.flags &=~ GLABEL_FLG_BORDER; + flags &=~ GLABEL_FLG_BORDER; + widget->w.g.flags |= flags; gwinSetVisible(&widget->w.g, pInit->g.show); return (GHandle)widget; |