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

Timestamp:

2022-04-04T18:49:30Z (3 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/wdecor.c (modified) (5 diffs)

uspace/lib/ui/src/wdecor.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
 
 static void ui_wdecor_btn_clicked(ui_pbutton_t *, void *);
+static errno_t ui_wdecor_btn_close_paint(ui_pbutton_t *, void *,
+    gfx_coord2_t *);
 
 static ui_pbutton_cb_t ui_wdecor_btn_close_cb = {
         .clicked = ui_wdecor_btn_clicked
+};
+
+static ui_pbutton_decor_ops_t ui_wdecor_btn_close_decor_ops = {
+        .paint = ui_wdecor_btn_close_paint
 };
 
@@ -62 +68 @@
         wdecor_tbar_h = 22,
         wdecor_frame_w = 4,
-        wdecor_frame_w_text = 1
+        wdecor_frame_w_text = 1,
+        wdecor_close_cross_n = 5,
+        wdecor_close_cross_w = 2,
+        wdecor_close_cross_h = 1
 };
 
@@ -98 +107 @@
         ui_pbutton_set_cb(wdecor->btn_close, &ui_wdecor_btn_close_cb,
             (void *)wdecor);
+
+        ui_pbutton_set_decor_ops(wdecor->btn_close,
+            &ui_wdecor_btn_close_decor_ops, (void *)wdecor);
 
         wdecor->res = resource;
@@ -647 +659 @@
 }
 
+/** Paint close button decoration.
+ *
+ * @param pbutton Push button
+ * @param arg Argument (ui_wdecor_t *)
+ * @param pos Center position
+ */
+static errno_t ui_wdecor_btn_close_paint(ui_pbutton_t *pbutton,
+    void *arg, gfx_coord2_t *pos)
+{
+        ui_wdecor_t *wdecor = (ui_wdecor_t *)arg;
+        gfx_coord2_t p;
+        errno_t rc;
+
+        rc = gfx_set_color(wdecor->res->gc, wdecor->res->btn_text_color);
+        if (rc != EOK)
+                return rc;
+
+        p.x = pos->x - 1;
+        p.y = pos->y - 1;
+        return ui_paint_cross(wdecor->res->gc, &p, wdecor_close_cross_n,
+            wdecor_close_cross_w, wdecor_close_cross_h);
+}
+
 /** @}
  */