Changes in uspace/lib/ui/src/checkbox.c [806d761:307d4d2] in mainline

File:

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

uspace/lib/ui/src/checkbox.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2021 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
 };
 
@@ -139 +136 @@
 }
 
-/** Set check box rectangle.
- *
- * @param checkbox Check box
- * @param rect New check box rectangle
+/** Set button rectangle.
+ *
+ * @param checkbox Button
+ * @param rect New button rectangle
  */
 void ui_checkbox_set_rect(ui_checkbox_t *checkbox, gfx_rect_t *rect)
 {
         checkbox->rect = *rect;
-}
-
-/** Return if check box is checked.
- *
- * @param checkbox Check box
- * @return @c true iff check box is checked
- */
-bool ui_checkbox_get_checked(ui_checkbox_t *checkbox)
-{
-        return checkbox->checked;
-}
-
-/** Set check box checked state.
- *
- * @param checkbox Check box
- * @param checked @c true iff checkbox should be checked
- */
-void ui_checkbox_set_checked(ui_checkbox_t *checkbox, bool checked)
-{
-        checkbox->checked = checked;
 }
 
@@ -211 +188 @@
 
         if (checkbox->checked) {
-                rc = gfx_set_color(checkbox->res->gc,
-                    checkbox->res->entry_fg_color);
+                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.color = checkbox->res->entry_fg_color;
+                fmt.halign = gfx_halign_center;
+                fmt.valign = gfx_valign_center;
+
+                rc = gfx_puttext(checkbox->res->font, &box_center, &fmt, "X");
                 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;
         }
 
@@ -231 +207 @@
 
         gfx_text_fmt_init(&fmt);
-        fmt.font = checkbox->res->font;
         fmt.color = checkbox->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_center;
 
-        rc = gfx_puttext(&pos, &fmt, checkbox->caption);
+        rc = gfx_puttext(checkbox->res->font, &pos, &fmt, checkbox->caption);
         if (rc != EOK)
                 goto error;
@@ -269 +244 @@
 
         gfx_text_fmt_init(&fmt);
-        fmt.font = checkbox->res->font;
         fmt.color = depressed ? checkbox->res->entry_act_bg_color :
             checkbox->res->wnd_text_color;
@@ -275 +249 @@
         fmt.valign = gfx_valign_top;
 
-        rc = gfx_puttext(&pos, &fmt, checkbox->checked ? "[X]" : "[ ]");
+        rc = gfx_puttext(checkbox->res->font, &pos, &fmt,
+            checkbox->checked ? "[X]" : "[ ]");
         if (rc != EOK)
                 goto error;
@@ -284 +259 @@
         fmt.color = checkbox->res->wnd_text_color;
 
-        rc = gfx_puttext(&pos, &fmt, checkbox->caption);
+        rc = gfx_puttext(checkbox->res->font, &pos, &fmt, checkbox->caption);
         if (rc != EOK)
                 goto error;
@@ -422 +397 @@
                 }
                 break;
-        case POS_DCLICK:
-                break;
         }