Changeset 86fff971 in mainline for uspace/lib/ui/src/paint.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/paint.c (modified) (5 diffs)

uspace/lib/ui/src/paint.c

@@ -365 +365 @@
  * @param pos Center position
  * @param n Length of triangle side
+ * @return EOK on success or an error code
  */
 errno_t ui_paint_up_triangle(gfx_context_t *gc, gfx_coord2_t *pos,
@@ -391 +392 @@
  * @param pos Center position
  * @param n Length of triangle side
+ * @return EOK on success or an error code
  */
 errno_t ui_paint_down_triangle(gfx_context_t *gc, gfx_coord2_t *pos,
@@ -417 +419 @@
  * @param pos Center position
  * @param n Length of triangle side
+ * @return EOK on success or an error code
  */
 errno_t ui_paint_left_triangle(gfx_context_t *gc, gfx_coord2_t *pos,
@@ -443 +446 @@
  * @param pos Center position
  * @param n Length of triangle side
+ * @return EOK on success or an error code
  */
 errno_t ui_paint_right_triangle(gfx_context_t *gc, gfx_coord2_t *pos,
@@ -456 +460 @@
                 rect.p1.x = pos->x + n / 2 - i + 1;
                 rect.p1.y = pos->y + i + 1;
+                rc = gfx_fill_rect(gc, &rect);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        return EOK;
+}
+
+/** Paint diagonal cross (X).
+ *
+ * @param gc Graphic context
+ * @param pos Center position
+ * @param n Length of each leg
+ * @param w Pen width
+ * @param h Pen height
+ * @return EOK on success or an error code
+ */
+errno_t ui_paint_cross(gfx_context_t *gc, gfx_coord2_t *pos,
+    gfx_coord_t n, gfx_coord_t w, gfx_coord_t h)
+{
+        gfx_coord_t i;
+        gfx_rect_t rect;
+        errno_t rc;
+
+        rect.p0.x = pos->x;
+        rect.p0.y = pos->y;
+        rect.p1.x = pos->x + w;
+        rect.p1.y = pos->y + h;
+        rc = gfx_fill_rect(gc, &rect);
+        if (rc != EOK)
+                return rc;
+
+        for (i = 1; i < n; i++) {
+                rect.p0.x = pos->x - i;
+                rect.p0.y = pos->y - i;
+                rect.p1.x = pos->x - i + w;
+                rect.p1.y = pos->y - i + h;
+                rc = gfx_fill_rect(gc, &rect);
+                if (rc != EOK)
+                        return rc;
+
+                rect.p0.x = pos->x - i;
+                rect.p0.y = pos->y + i;
+                rect.p1.x = pos->x - i + w;
+                rect.p1.y = pos->y + i + h;
+                rc = gfx_fill_rect(gc, &rect);
+                if (rc != EOK)
+                        return rc;
+
+                rect.p0.x = pos->x + i;
+                rect.p0.y = pos->y - i;
+                rect.p1.x = pos->x + i + w;
+                rect.p1.y = pos->y - i + h;
+                rc = gfx_fill_rect(gc, &rect);
+                if (rc != EOK)
+                        return rc;
+
+                rect.p0.x = pos->x + i;
+                rect.p0.y = pos->y + i;
+                rect.p1.x = pos->x + i + w;
+                rect.p1.y = pos->y + i + h;
                 rc = gfx_fill_rect(gc, &rect);
                 if (rc != EOK)