Changeset 7cf5ddb in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2023-03-08T18:21:22Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

42c2e65, 72ac106

Parents:

bea6233

Message:

Generic UI list control

Derived from file list, now file list is based on UI list.
Whew!

File:

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

uspace/app/uidemo/uidemo.c

@@ -44 +44 @@
 #include <ui/image.h>
 #include <ui/label.h>
+#include <ui/list.h>
 #include <ui/menubar.h>
 #include <ui/menuentry.h>
@@ -598 +599 @@
         ui_menu_entry_t *mmodify;
         ui_menu_entry_t *mabout;
+        ui_list_entry_attr_t eattr;
         errno_t rc;
 
@@ -1183 +1185 @@
 
         ui_tab_add(demo.tbasic, ui_fixed_ctl(demo.bfixed));
+
+        rc = ui_fixed_create(&demo.lfixed);
+        if (rc != EOK) {
+                printf("Error creating fixed layout.\n");
+                return rc;
+        }
+
+        rc = ui_list_create(window, false, &demo.list);
+        if (rc != EOK) {
+                printf("Error creating list.\n");
+                return rc;
+        }
+
+        ui_list_entry_attr_init(&eattr);
+
+        eattr.caption = "One";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Two";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Three";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Four";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Five";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Six";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 4;
+                rect.p0.y = 5;
+                rect.p1.x = 41;
+                rect.p1.y = 10;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 88;
+                rect.p1.x = 245;
+                rect.p1.y = 173;
+        }
+
+        ui_list_set_rect(demo.list, &rect);
+
+        rc = ui_fixed_add(demo.lfixed, ui_list_ctl(demo.list));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        ui_tab_add(demo.tlists, ui_fixed_ctl(demo.lfixed));
 
         ui_window_add(window, ui_fixed_ctl(demo.fixed));