Changeset 03145ee in mainline for uspace/app/calculator/calculator.c

Timestamp:

2020-11-10T09:00:48Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d942ca4

Parents:

0d71fd6

git-author:

Jiri Svoboda <jiri@…> (2020-11-09 20:00:37)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-10 09:00:48)

Message:

Add UI text entry (read-only)

We use the read-only text entry to display calculator output.

File:

• uspace/app/calculator/calculator.c (modified) (5 diffs)

uspace/app/calculator/calculator.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-#include <ui/label.h>
+#include <ui/entry.h>
 #include <ui/fixed.h>
 #include <ui/pbutton.h>
@@ -133 +133 @@
 
 static char *expr = NULL;
-static ui_label_t *display;
+static ui_entry_t *display;
 
 static bool is_digit(char c)
@@ -350 +350 @@
 {
         if (expr != NULL)
-                (void) ui_label_set_text(display, (void *) expr);
+                (void) ui_entry_set_text(display, (void *) expr);
         else
-                (void) ui_label_set_text(display, (void *) NULL_DISPLAY);
-
-        ui_label_paint(display);
+                (void) ui_entry_set_text(display, (void *) NULL_DISPLAY);
+
+        ui_entry_paint(display);
 }
 
@@ -366 +366 @@
         switch (error_type) {
         case ERROR_SYNTAX:
-                (void) ui_label_set_text(display,
+                (void) ui_entry_set_text(display,
                     (void *) SYNTAX_ERROR_DISPLAY);
                 break;
         case ERROR_NUMERIC:
-                (void) ui_label_set_text(display,
+                (void) ui_entry_set_text(display,
                     (void *) NUMERIC_ERROR_DISPLAY);
                 break;
         default:
-                (void) ui_label_set_text(display,
+                (void) ui_entry_set_text(display,
                     (void *) UNKNOWN_ERROR_DISPLAY);
                 break;
         }
 
-        ui_label_paint(display);
+        ui_entry_paint(display);
 }
 
@@ -618 +618 @@
         }
 
-        rc = ui_label_create(ui_res, NULL_DISPLAY, &display);
+        rc = ui_entry_create(ui_res, NULL_DISPLAY, &display);
         if (rc != EOK) {
-                printf("Error creating label.\n");
+                printf("Error creating text lentry.\n");
                 return rc;
         }
 
         rect.p0.x = 15;
-        rect.p0.y = 50;
+        rect.p0.y = 45;
         rect.p1.x = 235;
         rect.p1.y = 70;
-        ui_label_set_rect(display, &rect);
-        ui_label_set_halign(display, gfx_halign_right);
-
-        rc = ui_fixed_add(fixed, ui_label_ctl(display));
+        ui_entry_set_rect(display, &rect);
+        ui_entry_set_halign(display, gfx_halign_right);
+
+        rc = ui_fixed_add(fixed, ui_entry_ctl(display));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");