Changeset 03145ee in mainline for uspace/lib

Timestamp:

2020-11-10T09:00:48Z (5 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.

Location:

uspace/lib/ui

Files:

• include/types/ui/entry.h (added)
• include/ui/entry.h (added)
• meson.build (modified) (2 diffs)
• private/entry.h (added)
• private/resource.h (modified) (1 diff)
• src/entry.c (added)
• src/resource.c (modified) (5 diffs)
• test/entry.c (added)
• test/main.c (modified) (1 diff)

uspace/lib/ui/meson.build

@@ -31 +31 @@
         'src/control.c',
         'src/dummygc.c',
+        'src/entry.c',
         'src/fixed.c',
         'src/image.c',
@@ -44 +45 @@
 test_src = files(
         'test/control.c',
+        'test/entry.c',
         'test/fixed.c',
         'test/image.c',

uspace/lib/ui/private/resource.h

@@ -87 +87 @@
         /** Inactive titlebar text color */
         gfx_color_t *tbar_inact_text_color;
+
+        /** Entry (text entry, checkbox, radio button) foreground color */
+        gfx_color_t *entry_fg_color;
+        /** Entry (text entry, checkbox, raido button) background color */
+        gfx_color_t *entry_bg_color;
 };
 

uspace/lib/ui/src/resource.c

@@ -74 +74 @@
         gfx_color_t *tbar_act_text_color = NULL;
         gfx_color_t *tbar_inact_text_color = NULL;
+        gfx_color_t *entry_fg_color = NULL;
+        gfx_color_t *entry_bg_color = NULL;
         errno_t rc;
 
@@ -156 +158 @@
         rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858,
             &tbar_inact_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &entry_fg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &entry_bg_color);
         if (rc != EOK)
                 goto error;
@@ -180 +190 @@
         resource->tbar_inact_bg_color = tbar_inact_bg_color;
         resource->tbar_inact_text_color = tbar_inact_text_color;
+
+        resource->entry_fg_color = entry_fg_color;
+        resource->entry_bg_color = entry_bg_color;
 
         *rresource = resource;
@@ -217 +230 @@
                 gfx_color_delete(tbar_inact_text_color);
 
+        if (entry_fg_color != NULL)
+                gfx_color_delete(entry_fg_color);
+        if (entry_bg_color != NULL)
+                gfx_color_delete(entry_bg_color);
+
         if (tface != NULL)
                 gfx_typeface_destroy(tface);
@@ -250 +268 @@
         gfx_color_delete(resource->tbar_inact_text_color);
 
+        gfx_color_delete(resource->entry_fg_color);
+        gfx_color_delete(resource->entry_bg_color);
+
         gfx_font_close(resource->font);
         gfx_typeface_destroy(resource->tface);

uspace/lib/ui/test/main.c

@@ -32 +32 @@
 
 PCUT_IMPORT(control);
+PCUT_IMPORT(entry);
 PCUT_IMPORT(fixed);
 PCUT_IMPORT(image);