Changeset 86fff971 in mainline for uspace/lib/ui/src/checkbox.c

Timestamp:

2022-04-04T18:49:30Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fd05ea6

Parents:

d68239a1

Message:

'X' does not mark the spot

Stop misusing 'X' character as a cross mark, create a routine for
drawing a cross and use it as a custom decoration for the close button.
Also use it for checkbox cross.

File:

• uspace/lib/ui/src/checkbox.c (modified) (3 diffs)

uspace/lib/ui/src/checkbox.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -52 +52 @@
         checkbox_box_h = 16,
         checkbox_label_margin = 8,
+        checkbox_cross_n = 5,
+        checkbox_cross_w = 2,
+        checkbox_cross_h = 2
 };
 
@@ -188 +191 @@
 
         if (checkbox->checked) {
-                box_center.x = (box_inside.p0.x + box_inside.p1.x) / 2;
-                box_center.y = (box_inside.p0.y + box_inside.p1.y) / 2;
-
-                gfx_text_fmt_init(&fmt);
-                fmt.font = checkbox->res->font;
-                fmt.color = checkbox->res->entry_fg_color;
-                fmt.halign = gfx_halign_center;
-                fmt.valign = gfx_valign_center;
-
-                rc = gfx_puttext(&box_center, &fmt, "X");
+                rc = gfx_set_color(checkbox->res->gc,
+                    checkbox->res->entry_fg_color);
+                if (rc != EOK)
+                        goto error;
+
+                box_center.x = (box_inside.p0.x + box_inside.p1.x) / 2 - 1;
+                box_center.y = (box_inside.p0.y + box_inside.p1.y) / 2 - 1;
+
+                rc = ui_paint_cross(checkbox->res->gc, &box_center,
+                    checkbox_cross_n, checkbox_cross_w, checkbox_cross_h);
                 if (rc != EOK)
                         goto error;