Changes in uspace/app/uidemo/uidemo.c [08499f0:9a07ee3] in mainline

File:

• uspace/app/uidemo/uidemo.c (modified) (7 diffs)

uspace/app/uidemo/uidemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#include <fibril_synch.h>
 #include <gfx/bitmap.h>
 #include <gfx/coord.h>
@@ -61 +60 @@
 #include "uidemo.h"
 
-enum {
-        scrollbar_update_interval_ms = 1000,
-        ui_demo_progress_step = 17
-};
-
 static errno_t bitmap_moire(gfx_bitmap_t *, gfx_coord_t, gfx_coord_t);
 
@@ -720 +714 @@
         (void) demo;
         ui_msg_dialog_destroy(dialog);
-}
-
-static void ui_demo_timer_fun(void *arg)
-{
-        ui_demo_t *demo = (ui_demo_t *) arg;
-
-        if (demo->progress_value < 100) {
-                demo->progress_value += ui_demo_progress_step;
-                if (demo->progress_value > 100)
-                        demo->progress_value = 100;
-        } else {
-                demo->progress_value = 0;
-        }
-
-        ui_progress_set_value(demo->progress, demo->progress_value);
-
-        if (ui_tab_is_selected(demo->tbars)) {
-                ui_lock(demo->ui);
-                ui_progress_paint(demo->progress);
-                ui_unlock(demo->ui);
-        }
-
-        fibril_timer_set(demo->timer, 1000 * scrollbar_update_interval_ms,
-            ui_demo_timer_fun, (void *)demo);
 }
 
@@ -986 +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) {
@@ -1465 +1429 @@
         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));
 
-        demo.timer = fibril_timer_create(NULL);
-        if (demo.timer == NULL) {
-                printf("Error creating timer.\n");
-                return ENOMEM;
-        }
-
-        fibril_timer_set(demo.timer, 1000 * scrollbar_update_interval_ms,
-            ui_demo_timer_fun, (void *)&demo);
-
         rc = ui_window_paint(window);
         if (rc != EOK) {
@@ -1518 +1438 @@
 
         ui_run(ui);
-
-        fibril_timer_clear(demo.timer);
-        fibril_timer_destroy(demo.timer);
 
         ui_window_destroy(window);