aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-11-07 00:39:08 +0100
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-11-07 00:39:08 +0100
commitea4cadec78ba4e559f7fa1049f7d202e9e316fb7 (patch)
tree1e549d25bb1029bc175fe3af46e2761e5f53fd75 /demos
parent636b6edf8130dae5611445a42167c9387b43766f (diff)
downloaduGFX-ea4cadec78ba4e559f7fa1049f7d202e9e316fb7.tar.gz
uGFX-ea4cadec78ba4e559f7fa1049f7d202e9e316fb7.tar.bz2
uGFX-ea4cadec78ba4e559f7fa1049f7d202e9e316fb7.zip
Revert "Adding justification parameter to gwinLabelCreate()"
This reverts commit e8a769c3823eef72a9e064d3bf992152ed261ad2.
Diffstat (limited to 'demos')
-rw-r--r--demos/applications/combo/main.c10
-rw-r--r--demos/modules/gwin/frame/main.c2
-rw-r--r--demos/modules/gwin/label/main.c4
-rw-r--r--demos/modules/gwin/list/main.c4
-rw-r--r--demos/modules/gwin/tabset/main.c6
-rw-r--r--demos/modules/gwin/widgets/main.c10
6 files changed, 18 insertions, 18 deletions
diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c
index bf37d242..fba3d851 100644
--- a/demos/applications/combo/main.c
+++ b/demos/applications/combo/main.c
@@ -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:");
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index 9f4b2419..a97525ab 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -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;
diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c
index 8ddce320..425436ea 100644
--- a/demos/modules/gwin/label/main.c
+++ b/demos/modules/gwin/label/main.c
@@ -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:");
}
diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c
index ad999aa2..0102f276 100644
--- a/demos/modules/gwin/list/main.c
+++ b/demos/modules/gwin/list/main.c
@@ -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;
diff --git a/demos/modules/gwin/tabset/main.c b/demos/modules/gwin/tabset/main.c
index 26c29ae4..f70ab909 100644
--- a/demos/modules/gwin/tabset/main.c
+++ b/demos/modules/gwin/tabset/main.c
@@ -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) {
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index 6f871ce2..8f5a6329 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -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:");