diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-07 00:39:08 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-07 00:39:08 +0100 |
| commit | ea4cadec78ba4e559f7fa1049f7d202e9e316fb7 (patch) | |
| tree | 1e549d25bb1029bc175fe3af46e2761e5f53fd75 /src/gwin/gwin_label.c | |
| parent | 636b6edf8130dae5611445a42167c9387b43766f (diff) | |
| download | uGFX-ea4cadec78ba4e559f7fa1049f7d202e9e316fb7.tar.gz uGFX-ea4cadec78ba4e559f7fa1049f7d202e9e316fb7.tar.bz2 uGFX-ea4cadec78ba4e559f7fa1049f7d202e9e316fb7.zip | |
Revert "Adding justification parameter to gwinLabelCreate()"
This reverts commit e8a769c3823eef72a9e064d3bf992152ed261ad2.
Diffstat (limited to 'src/gwin/gwin_label.c')
| -rw-r--r-- | src/gwin/gwin_label.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/gwin/gwin_label.c b/src/gwin/gwin_label.c index c8a9a0f0..9b62679f 100644 --- a/src/gwin/gwin_label.c +++ b/src/gwin/gwin_label.c @@ -80,7 +80,7 @@ static const gwidgetVMT labelVMT = { #endif }; -GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit, justify_t justify) { +GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit) { uint16_t flags = 0; // auto assign width @@ -89,7 +89,7 @@ GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit, flags |= GLABEL_FLG_WAUTO; pInit->g.width = getwidth(pInit->text, gwinGetDefaultFont(), gdispGGetWidth(g) - pInit->g.x); } - + // auto assign height if (pInit->g.height <= 0) { flags |= GLABEL_FLG_HAUTO; @@ -99,8 +99,6 @@ GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit, if (!(widget = (GLabelObject *)_gwidgetCreate(g, &widget->w, pInit, &labelVMT))) return 0; - widget->justify = justify; - #if GWIN_LABEL_ATTRIBUTE widget->tab = 0; widget->attr = 0; @@ -165,13 +163,12 @@ void gwinLabelDefaultDraw(GWidgetObject *gw, void *param) { #if GWIN_LABEL_ATTRIBUTE if (gw2obj->attr) { - gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw2obj->tab, h, gw2obj->attr, gw->g.font, c, gw->pstyle->background, gw2obj->justify); - gdispGFillStringBox(gw->g.display, gw->g.x + gw2obj->tab, gw->g.y, w-gw2obj->tab, h, gw->text, gw->g.font, c, gw->pstyle->background, gw2obj->justify); - } else { - gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, w, h, gw->text, gw->g.font, c, gw->pstyle->background, gw2obj->justify); - } + gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw2obj->tab, h, gw2obj->attr, gw->g.font, c, gw->pstyle->background, justifyLeft); + gdispGFillStringBox(gw->g.display, gw->g.x + gw2obj->tab, gw->g.y, w-gw2obj->tab, h, gw->text, gw->g.font, c, gw->pstyle->background, justifyLeft); + } else + gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, w, h, gw->text, gw->g.font, c, gw->pstyle->background, justifyLeft); #else - gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, w, h, gw->text, gw->g.font, c, gw->pstyle->background, gw2obj->justify); + gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, w, h, gw->text, gw->g.font, c, gw->pstyle->background, justifyLeft); #endif // render the border (if any) |