aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin/gwin_checkbox.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-07-08 12:19:30 +1000
committerinmarket <andrewh@inmarket.com.au>2018-07-08 12:19:30 +1000
commit2e8eaa34717f99c9696867b62ff5f19e76a7ccf8 (patch)
tree5842c0ccaaffd195430b83fd2bd9211bd6f1fffe /src/gwin/gwin_checkbox.c
parent788cbced624d83a4c493182fde15cfa244910294 (diff)
downloaduGFX-2e8eaa34717f99c9696867b62ff5f19e76a7ccf8.tar.gz
uGFX-2e8eaa34717f99c9696867b62ff5f19e76a7ccf8.tar.bz2
uGFX-2e8eaa34717f99c9696867b62ff5f19e76a7ccf8.zip
Added type gJustify to replace V2.x justify_t, and values gJustifyXXX replace justifyXXX
Diffstat (limited to 'src/gwin/gwin_checkbox.c')
-rw-r--r--src/gwin/gwin_checkbox.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gwin/gwin_checkbox.c b/src/gwin/gwin_checkbox.c
index 5e6806fd..9184b9e9 100644
--- a/src/gwin/gwin_checkbox.c
+++ b/src/gwin/gwin_checkbox.c
@@ -196,7 +196,7 @@ void gwinCheckboxDraw_CheckOnLeft(GWidgetObject *gw, void *param) {
_gwidgetDrawFocusRect(gw, 1, 1, ld-2, ld-2);
// Draw the text
- gdispGFillStringBox(gw->g.display, gw->g.x+ld+1, gw->g.y, gw->g.width-ld-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, justifyLeft);
+ gdispGFillStringBox(gw->g.display, gw->g.x+ld+1, gw->g.y, gw->g.width-ld-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, gJustifyLeft);
#undef gcw
}
@@ -228,7 +228,7 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) {
_gwidgetDrawFocusRect(gw, ep+1, 1, ld-2, ld-2);
// Draw the text
- gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, ep-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, justifyRight);
+ gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, ep-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, gJustifyRight);
#undef gcw
}
@@ -245,7 +245,7 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) {
pcol = _gwinGetFlashedColor(gw, pcol, gTrue);
#endif
- gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, justifyCenter);
+ gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, gJustifyCenter);
gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+gw->g.height-1, gw->g.x+gw->g.width-2, gw->g.y+gw->g.height-1, pcol->edge);
}
@@ -273,7 +273,7 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) {
for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
- gdispGDrawStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, justifyCenter);
+ gdispGDrawStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, gJustifyCenter);
gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+gw->g.height-1, gw->g.x+gw->g.width-2, gw->g.y+gw->g.height-1, pcol->edge);
}