Changeset ba09d06 in mainline

Timestamp:

2020-10-20T11:10:32Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

20d2c6c

Parents:

1769693

git-author:

Jiri Svoboda <jiri@…> (2020-10-19 21:10:12)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-20 11:10:32)

Message:

UI label

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (6 diffs)
• app/uidemo/uidemo.h (modified) (2 diffs)
• lib/ui/include/types/ui/label.h (added)
• lib/ui/include/ui/label.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/label.h (added)
• lib/ui/src/label.c (added)
• lib/ui/src/pbutton.c (modified) (1 diff)
• lib/ui/src/resource.c (modified) (1 diff)
• lib/ui/src/wdecor.c (modified) (1 diff)
• lib/ui/test/label.c (added)
• lib/ui/test/main.c (modified) (1 diff)

uspace/app/uidemo/uidemo.c

@@ -40 +40 @@
 #include <str.h>
 #include <task.h>
+#include <ui/label.h>
 #include <ui/pbutton.h>
 #include <ui/resource.h>
@@ -138 +139 @@
 {
         ui_demo_t *demo = (ui_demo_t *) arg;
+        errno_t rc;
 
         if (pbutton == demo->pb1) {
                 printf("Clicked 'Confirm' button\n");
+                rc = ui_label_set_text(demo->label, "Confirmed");
+                if (rc != EOK)
+                        printf("Error changing label text.\n");
+                (void) ui_label_paint(demo->label);
         } else {
                 printf("Clicked 'Cancel' button\n");
+                rc = ui_label_set_text(demo->label, "Cancelled");
+                if (rc != EOK)
+                        printf("Error changing label text.\n");
+                (void) ui_label_paint(demo->label);
         }
 }
@@ -221 +231 @@
         ui_wdecor_set_cb(demo.wdecor, &wdecor_cb, (void *) &demo);
 
+        rc = ui_label_create(ui_res, "Hello there!", &demo.label);
+        if (rc != EOK) {
+                printf("Error creating label.\n");
+                return rc;
+        }
+
+        rect.p0.x = 60;
+        rect.p0.y = 37;
+        rect.p1.x = 160;
+        rect.p1.y = 50;
+        ui_label_set_rect(demo.label, &rect);
+
         rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);
         if (rc != EOK) {
@@ -229 +251 @@
         ui_pbutton_set_cb(demo.pb1, &pbutton_cb, (void *) &demo);
 
-        rect.p0.x = 20;
-        rect.p0.y = 50;
-        rect.p1.x = 100;
-        rect.p1.y = 80;
+        rect.p0.x = 15;
+        rect.p0.y = 60;
+        rect.p1.x = 105;
+        rect.p1.y = 88;
         ui_pbutton_set_rect(demo.pb1, &rect);
 
@@ -245 +267 @@
         ui_pbutton_set_cb(demo.pb2, &pbutton_cb, (void *) &demo);
 
-        rect.p0.x = 120;
-        rect.p0.y = 50;
-        rect.p1.x = 200;
-        rect.p1.y = 80;
+        rect.p0.x = 115;
+        rect.p0.y = 60;
+        rect.p1.x = 205;
+        rect.p1.y = 88;
         ui_pbutton_set_rect(demo.pb2, &rect);
 
@@ -275 +297 @@
         if (rc != EOK) {
                 printf("Error painting window decoration.\n");
+                return rc;
+        }
+
+        rc = ui_label_paint(demo.label);
+        if (rc != EOK) {
+                printf("Error painting button.\n");
                 return rc;
         }

uspace/app/uidemo/uidemo.h

@@ -38 +38 @@
 
 #include <display.h>
+#include <ui/label.h>
 #include <ui/pbutton.h>
 #include <ui/wdecor.h>
@@ -45 +46 @@
         display_window_t *dwindow;
         ui_wdecor_t *wdecor;
+        ui_label_t *label;
         ui_pbutton_t *pb1;
         ui_pbutton_t *pb2;

uspace/lib/ui/meson.build

@@ -29 +29 @@
 deps = [ 'gfx', 'gfxfont' ]
 src = files(
+        'src/label.c',
         'src/paint.c',
         'src/pbutton.c',
@@ -36 +37 @@
 
 test_src = files(
+        'test/label.c',
         'test/main.c',
         'test/paint.c',

uspace/lib/ui/src/pbutton.c

@@ -107 +107 @@
  *
  * @param pbutton Button
- * @param rect New button rectanle
+ * @param rect New button rectangle
  */
 void ui_pbutton_set_rect(ui_pbutton_t *pbutton, gfx_rect_t *rect)

uspace/lib/ui/src/resource.c

@@ -50 +50 @@
  *
  * @param gc Graphic context
- * @param rresource Place to store pointer to new push button
+ * @param rresource Place to store pointer to new UI resource
  * @return EOK on success, ENOMEM if out of memory
  */

uspace/lib/ui/src/wdecor.c

@@ -102 +102 @@
  *
  * @param wdecor Window decoration
- * @param rect New button rectanle
+ * @param rect New window decoration rectangle
  */
 void ui_wdecor_set_rect(ui_wdecor_t *wdecor, gfx_rect_t *rect)

uspace/lib/ui/test/main.c

@@ -31 +31 @@
 PCUT_INIT;
 
+PCUT_IMPORT(label);
 PCUT_IMPORT(paint);
 PCUT_IMPORT(pbutton);