Revert "Adding justification parameter to gwinLabelCreate()"

This reverts commit e8a769c3823eef72a9e064d3bf992152ed261ad2.

2 files changed, 9 insertions, 15 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)
diff --git a/src/gwin/gwin_label.h b/src/gwin/gwin_label.h
index 05f8ca9d..aaacd253 100644
--- a/src/gwin/gwin_label.h
+++ b/src/gwin/gwin_label.h
@@ -38,8 +38,6 @@
 typedef struct GLabelObject {
 	GWidgetObject	w;
 
-	justify_t justify;
-
 	#if GWIN_LABEL_ATTRIBUTE
 		coord_t         tab;
 		const char*		attr;
@@ -57,14 +55,13 @@ extern "C" {
  * @param[in] g			The GDisplay to display this window on
  * @param[in] widget	The label structure to initialise. If this is NULL, the structure is dynamically allocated.
  * @param[in] pInit		The initialisation parameters to use.
- * @param[in] justify	The justification.
  *
  * @return				NULL if there is no resultat drawing area, otherwise the widget handle.
  *
  * @api
  */
-GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit, justify_t justify);
-#define gwinLabelCreate(w, pInit, justify)			gwinGLabelCreate(GDISP, w, pInit, justify)
+GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit);
+#define gwinLabelCreate(w, pInit)			gwinGLabelCreate(GDISP, w, pInit)
 
 /**
  * @brief				Border settings for the default rendering routine