Changeset 0d1d0ea in mainline for uspace/lib/ui/test

Timestamp:

2022-03-31T14:37:31Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d68239a1

Parents:

7ca7215

git-author:

Jiri Svoboda <jiri@…> (2022-03-30 17:37:11)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-31 14:37:31)

Message:

Routine to fill rectangle with character

Use it to simplify scrollbar rendering.

Location:

uspace/lib/ui/test

Files:

• paint.c (modified) (2 diffs)
• scrollbar.c (modified) (2 diffs)

uspace/lib/ui/test/paint.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -313 +313 @@
 }
 
+/** Paint text rectangle */
+PCUT_TEST(text_rect)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        ui_resource_t *resource = NULL;
+        gfx_color_t *color = NULL;
+        test_gc_t tgc;
+        gfx_rect_t rect;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        rc = gfx_color_new_rgb_i16(1, 2, 3, &color);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 30;
+        rect.p1.y = 40;
+
+        /* Paint text box */
+        rc = ui_paint_text_rect(resource, &rect, color, "A");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_color_delete(color);
+        ui_resource_destroy(resource);
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 static errno_t testgc_set_clip_rect(void *arg, gfx_rect_t *rect)
 {

uspace/lib/ui/test/scrollbar.c

@@ -206 +206 @@
 }
 
-/** Paint horizontal scrollbar in text mode */
+/** Paint scrollbar in text mode */
 PCUT_TEST(paint_text_horiz)
 {
@@ -235 +235 @@
         ui_scrollbar_set_rect(scrollbar, &rect);
 
-        rc = ui_scrollbar_paint_text_horiz(scrollbar);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_scrollbar_destroy(scrollbar);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** Paint vertical scrollbar in text mode */
-PCUT_TEST(paint_text_vert)
-{
-        ui_t *ui = NULL;
-        ui_window_t *window = NULL;
-        ui_wnd_params_t params;
-        ui_scrollbar_t *scrollbar;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Hello";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(window);
-
-        rc = ui_scrollbar_create(ui, window, ui_sbd_vert, &scrollbar);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 1;
-        rect.p0.y = 1;
-        rect.p1.x = 2;
-        rect.p1.y = 10;
-        ui_scrollbar_set_rect(scrollbar, &rect);
-
-        rc = ui_scrollbar_paint_text_vert(scrollbar);
+        rc = ui_scrollbar_paint_text(scrollbar);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);