Changeset 5ef85c0 in mainline

Timestamp:

2022-03-17T12:16:03Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1026cc4

Parents:

71edd430

git-author:

Jiri Svoboda <jiri@…> (2022-03-16 19:15:43)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-17 12:16:03)

Message:

Scrollbar unit tests

Location:

uspace/lib/ui

Files:

• meson.build (modified) (1 diff)
• src/scrollbar.c (modified) (2 diffs)
• test/main.c (modified) (1 diff)
• test/scrollbar.c (added)
• test/slider.c (modified) (2 diffs)

uspace/lib/ui/meson.build

@@ -75 +75 @@
         'test/rbutton.c',
         'test/resource.c',
+        'test/scrollbar.c',
         'test/slider.c',
         'test/ui.c',

uspace/lib/ui/src/scrollbar.c

@@ -49 +49 @@
 #include "../private/scrollbar.h"
 
-/*
- * The kind reader will appreciate that scrollbar thumb dimensions 23:15
- * are chosen such that, after subtracting the frame width (2 times 1),
- * we get 21:13, which is a good approximation of the golden ratio.
- */
 enum {
         /** Scrollbar button width */
@@ -471 +466 @@
         w = scrollbar->rect.p1.x - scrollbar->rect.p0.x -
             2 * ui_scrollbar_btn_len_text;
+        assert(w >= 0);
+        if (w < 0)
+                return EINVAL;
+
         gchar = "\u2592";
         gcharsz = str_size(gchar);

uspace/lib/ui/test/main.c

@@ -48 +48 @@
 PCUT_IMPORT(rbutton);
 PCUT_IMPORT(resource);
+PCUT_IMPORT(scrollbar);
 PCUT_IMPORT(slider);
 PCUT_IMPORT(ui);

uspace/lib/ui/test/slider.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -225 +225 @@
         ui_slider_moved(slider, 42);
 
-        /* Moved with callback not implementing clicked */
+        /* Moved with callback not implementing moved */
         ui_slider_set_cb(slider, &dummy_slider_cb, NULL);
         ui_slider_moved(slider, 42);