Changeset 8a9a41e in mainline for uspace/app/calculator/calculator.c

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

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

uspace/app/calculator/calculator.c

@@ -833 +833 @@
         if (ui_is_textmode(ui)) {
                 params.rect.p1.x = 38;
-                params.rect.p1.y = 19;
+                params.rect.p1.y = 18;
 
                 calc.geom.menubar_rect.p0.x = 1;
-                calc.geom.menubar_rect.p0.y = 2;
+                calc.geom.menubar_rect.p0.y = 1;
                 calc.geom.menubar_rect.p1.x = params.rect.p1.x - 1;
-                calc.geom.menubar_rect.p1.y = 3;
+                calc.geom.menubar_rect.p1.y = 2;
                 calc.geom.entry_rect.p0.x = 4;
-                calc.geom.entry_rect.p0.y = 4;
+                calc.geom.entry_rect.p0.y = 3;
                 calc.geom.entry_rect.p1.x = 34;
-                calc.geom.entry_rect.p1.y = 5;
+                calc.geom.entry_rect.p1.y = 4;
                 calc.geom.btn_orig.x = 4;
-                calc.geom.btn_orig.y = 6;
+                calc.geom.btn_orig.y = 5;
                 calc.geom.btn_dim.x = 6;
                 calc.geom.btn_dim.y = 2;
@@ -945 +945 @@
         ui_entry_set_rect(display, &calc.geom.entry_rect);
         ui_entry_set_halign(display, gfx_halign_right);
+        ui_entry_set_read_only(display, true);
 
         rc = ui_fixed_add(fixed, ui_entry_ctl(display));