Changeset 7cf5ddb in mainline for uspace/app

Timestamp:

2023-03-08T18:21:22Z (3 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!

Location:

uspace/app

Files:

• nav/panel.c (modified) (5 diffs)
• uidemo/uidemo.c (modified) (3 diffs)
• uidemo/uidemo.h (modified) (3 diffs)

uspace/app/nav/panel.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
 };
 
+static void panel_flist_activate_req(ui_file_list_t *, void *);
 static void panel_flist_selected(ui_file_list_t *, void *, const char *);
 
 /** Panel file list callbacks */
 static ui_file_list_cb_t panel_flist_cb = {
-        .selected = panel_flist_selected
+        .activate_req = panel_flist_activate_req,
+        .selected = panel_flist_selected,
 };
 
@@ -216 +218 @@
         gfx_coord2_t pos;
         ui_control_t *ctl;
+        ui_evclaim_t claim;
 
         pos.x = event->hpos;
@@ -222 +225 @@
                 return ui_unclaimed;
 
+        ctl = ui_file_list_ctl(panel->flist);
+        claim = ui_control_pos_event(ctl, event);
+        if (claim == ui_claimed)
+                return ui_claimed;
+
         if (!panel->active && event->type == POS_PRESS)
                 panel_activate_req(panel);
 
-        ctl = ui_file_list_ctl(panel->flist);
-        return ui_control_pos_event(ctl, event);
+        return ui_claimed;
 }
 
@@ -416 +423 @@
 }
 
+/** File list in panel requests activation.
+ *
+ * @param flist File list
+ * @param arg Argument (panel_t *)
+ */
+static void panel_flist_activate_req(ui_file_list_t *flist, void *arg)
+{
+        panel_t *panel = (panel_t *)arg;
+
+        panel_activate_req(panel);
+}
+
 /** File in panel file list was selected.
  *

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));

uspace/app/uidemo/uidemo.h

@@ -42 +42 @@
 #include <ui/fixed.h>
 #include <ui/label.h>
+#include <ui/list.h>
 #include <ui/menu.h>
 #include <ui/menubar.h>
@@ -59 +60 @@
         ui_fixed_t *fixed;
         ui_fixed_t *bfixed;
+        ui_fixed_t *lfixed;
         ui_menu_bar_t *mbar;
         ui_menu_t *mfile;
@@ -80 +82 @@
         ui_scrollbar_t *hscrollbar;
         ui_scrollbar_t *vscrollbar;
+        ui_list_t *list;
 } ui_demo_t;