Changeset 9c7dc8e in mainline for uspace/lib/ui/src/entry.c

Timestamp:

2021-03-01T10:50:25Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cd74fa8

Parents:

77ffa01

git-author:

Jiri Svoboda <jiri@…> (2021-02-28 10:50:05)

git-committer:

Jiri Svoboda <jiri@…> (2021-03-01 10:50:25)

Message:

Print text as text in textmode UI. Make calculator smaller in text mode.

File:

• uspace/lib/ui/src/entry.c (modified) (5 diffs)

uspace/lib/ui/src/entry.c

@@ -46 +46 @@
 #include <ui/paint.h>
 #include <ui/entry.h>
+#include <ui/ui.h>
 #include "../private/entry.h"
 #include "../private/resource.h"
@@ -55 +56 @@
 enum {
         ui_entry_hpad = 4,
-        ui_entry_vpad = 4
+        ui_entry_vpad = 4,
+        ui_entry_hpad_text = 1,
+        ui_entry_vpad_text = 0
 };
 
@@ -173 +176 @@
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
+        gfx_coord_t hpad;
+        gfx_coord_t vpad;
         gfx_rect_t inside;
         errno_t rc;
+
+        if (entry->res->textmode) {
+                hpad = ui_entry_hpad_text;
+                vpad = ui_entry_vpad_text;
+        } else {
+                hpad = ui_entry_hpad;
+                vpad = ui_entry_vpad;
+        }
 
         /* Paint inset frame */
@@ -195 +208 @@
         case gfx_halign_left:
         case gfx_halign_justify:
-                pos.x = inside.p0.x + ui_entry_hpad;
+                pos.x = inside.p0.x + hpad;
                 break;
         case gfx_halign_center:
@@ -201 +214 @@
                 break;
         case gfx_halign_right:
-                pos.x = inside.p1.x - ui_entry_hpad;
+                pos.x = inside.p1.x - hpad;
                 break;
         }
 
-        pos.y = inside.p0.y + ui_entry_vpad;
+        pos.y = inside.p0.y + vpad;
 
         gfx_text_fmt_init(&fmt);