uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity
Browse Source

Revert "Adding justification parameter to gwinLabelCreate()" 

This reverts commit e8a769c382.
remotes/origin_old/ugfx_release_2.6
Joel Bodenmann 7 years ago
parent
636b6edf81
commit
ea4cadec78
9 changed files with 27 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      demos/applications/combo/main.c
  2. 2
      demos/modules/gwin/frame/main.c
  3. 4
      demos/modules/gwin/label/main.c
  4. 4
      demos/modules/gwin/list/main.c
  5. 6
      demos/modules/gwin/tabset/main.c
  6. 10
      demos/modules/gwin/widgets/main.c
  7. 1
      docs/releases.txt
  8. 17
      src/gwin/gwin_label.c
  9. 7
      src/gwin/gwin_label.h

10
demos/applications/combo/main.c
View File

@ -228,19 +228,19 @@ static void createWidgets(void) {
wi.g.parent = ghPgLabels;
wi.g.width = pagewidth-10; wi.g.height = LABEL_HEIGHT;
wi.g.x = wi.g.y = 5; wi.text = "N/A";
ghLabelSlider1 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider1 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider1, 100, "Slider 1:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelSlider2 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider2 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider2, 100, "Slider 2:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelSlider3 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider3 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider3, 100, "Slider 3:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelSlider4 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider4 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider4, 100, "Slider 4:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelRadio1 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelRadio1 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelRadio1, 100, "RadioButton 1:");

2
demos/modules/gwin/frame/main.c
View File

@ -31,7 +31,7 @@ static void _createWidgets(void) {
wi.g.y = 100;
wi.g.x = 150;
wi.text = "Surprise!";
gwinLabelCreate(0, &wi, justifyCenter);
gwinLabelCreate(0, &wi);
// Apply the frame parameters
wi.g.width = 300;

4
demos/modules/gwin/label/main.c
View File

@ -42,13 +42,13 @@ static void createWidgets(void) {
// Create the IP label
wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
wi.text = "192.168.1.42";
ghLabel1 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabel1 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabel1, 100, "Current IP:");
// Create the DHCP label
wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 100;
wi.text = "Off";
ghLabel2 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabel2 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabel2, 100, "DHCP:");
}

4
demos/modules/gwin/list/main.c
View File

@ -43,12 +43,12 @@ static void createWidgets(void) {
// Create the label for the first list
wi.g.width = 150; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
wi.text = "List 1: Default";
ghLabel1 = gwinLabelCreate(0, &wi, justifyCenter);
ghLabel1 = gwinLabelCreate(0, &wi);
// Create the label for the second list
wi.g.width = 150; wi.g.height = 20; wi.g.x = 165, wi.g.y = 80;
wi.text = "List 2: Smooth scrolling";
ghLabel1 = gwinLabelCreate(0, &wi, justifyCenter);
ghLabel1 = gwinLabelCreate(0, &wi);
// The first list widget
wi.g.width = 150;

6
demos/modules/gwin/tabset/main.c
View File

@ -52,19 +52,19 @@ static void createWidgets(void) {
wi.g.width = 120; wi.g.height = 20; wi.g.x = 10; wi.g.y = 10;
wi.g.parent = ghPage1;
wi.text = "This is page Nr. 1";
ghLabel1 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabel1 = gwinLabelCreate(0, &wi);
// Add some widgets to Page 2
wi.g.width = 120; wi.g.height = 20; wi.g.x = 10; wi.g.y = 50;
wi.g.parent = ghPage2;
wi.text = "This is page Nr. 2";
ghLabel2 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabel2 = gwinLabelCreate(0, &wi);
// Add some widgets to Page 3
wi.g.width = 120; wi.g.height = 20; wi.g.x = 10; wi.g.y = 90;
wi.g.parent = ghPage3;
wi.text = "This is page Nr. 3";
ghLabel3 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabel3 = gwinLabelCreate(0, &wi);
}
int main(void) {

10
demos/modules/gwin/widgets/main.c
View File

@ -325,19 +325,19 @@ static void createWidgets(void) {
wi.g.parent = ghPgLabels;
wi.g.width = pagewidth-10; wi.g.height = LABEL_HEIGHT;
wi.g.x = wi.g.y = 5; wi.text = "N/A";
ghLabelSlider1 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider1 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider1, 100, "Slider 1:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelSlider2 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider2 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider2, 100, "Slider 2:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelSlider3 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider3 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider3, 100, "Slider 3:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelSlider4 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelSlider4 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelSlider4, 100, "Slider 4:");
wi.g.y += LABEL_HEIGHT + 2;
ghLabelRadio1 = gwinLabelCreate(0, &wi, justifyLeft);
ghLabelRadio1 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabelRadio1, 100, "RadioButton 1:");

1
docs/releases.txt
View File

@ -25,7 +25,6 @@ FEATURE: Added word-wrapping support for gdispDrawStringBox() and gdispFillStrin
FIX: Fixing issue in touchscreen calibration code
FEATURE: Added GFX_OS_PRE_INIT_FUNCTION for early hardware initialization
FIX: Fixing GTIMER for high clock rate devices
FEATURE: Adding justification parameter to gwinLabelCreate()
*** Release 2.3 ***

17
src/gwin/gwin_label.c
View File

@ -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)

7
src/gwin/gwin_label.h
View File

@ -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

Write Preview
Loading…
Cancel
Save