Changeset 2f1be23 in mainline

Timestamp:

2026-05-13T17:54:45Z (10 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

2866531

Message:

Implement UI progress bar.

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (3 diffs)
• app/uidemo/uidemo.h (modified) (5 diffs)
• lib/ui/include/types/ui/progress.h (added)
• lib/ui/include/ui/progress.h (added)
• lib/ui/meson.build (modified) (3 diffs)
• lib/ui/private/progress.h (added)
• lib/ui/src/progress.c (added)
• lib/ui/test/progress.c (added)

uspace/app/uidemo/uidemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -956 +956 @@
         }
 
+        rc = ui_tab_create(demo.tabset, "Bars", &demo.tbars);
+        if (rc != EOK) {
+                printf("Error creating tab.\n");
+                return rc;
+        }
+
         rc = ui_fixed_add(demo.fixed, ui_tab_set_ctl(demo.tabset));
         if (rc != EOK) {
@@ -1428 +1434 @@
 
         ui_tab_add(demo.tlists, ui_fixed_ctl(demo.lfixed));
+
+        rc = ui_fixed_create(&demo.bars_fixed);
+        if (rc != EOK) {
+                printf("Error creating fixed layout.\n");
+                return rc;
+        }
+
+        rc = ui_progress_create(ui_res, 0, &demo.progress);
+        if (rc != EOK) {
+                printf("Error creating entry.\n");
+                return rc;
+        }
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 4;
+                rect.p0.y = 5;
+                rect.p1.x = 42;
+                rect.p1.y = 6;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 88;
+                rect.p1.x = 243;
+                rect.p1.y = 113;
+        }
+
+        ui_progress_set_rect(demo.progress, &rect);
+
+        rc = ui_fixed_add(demo.bars_fixed, ui_progress_ctl(demo.progress));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        ui_tab_add(demo.tbars, ui_fixed_ctl(demo.bars_fixed));
 
         ui_window_add(window, ui_fixed_ctl(demo.fixed));

uspace/app/uidemo/uidemo.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +46 @@
 #include <ui/menubar.h>
 #include <ui/pbutton.h>
+#include <ui/progress.h>
 #include <ui/rbutton.h>
 #include <ui/scrollbar.h>
@@ -61 +62 @@
         ui_fixed_t *bfixed;
         ui_fixed_t *lfixed;
+        ui_fixed_t *bars_fixed;
         ui_menu_bar_t *mbar;
         ui_menu_t *mfile;
@@ -69 +71 @@
         ui_tab_t *tbasic;
         ui_tab_t *tlists;
+        ui_tab_t *tbars;
         ui_entry_t *entry;
         ui_image_t *image;
@@ -83 +86 @@
         ui_scrollbar_t *vscrollbar;
         ui_list_t *list;
+        ui_progress_t *progress;
 } ui_demo_t;
 

uspace/lib/ui/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2023 Jiri Svoboda
+# Copyright (c) 2026 Jiri Svoboda
 # All rights reserved.
 #
@@ -49 +49 @@
         'src/pbutton.c',
         'src/popup.c',
+        'src/progress.c',
         'src/promptdialog.c',
         'src/rbutton.c',
@@ -85 +86 @@
         'test/popup.c',
         'test/promptdialog.c',
+        'test/progress.c',
         'test/rbutton.c',
         'test/resource.c',