Changeset 7cf5ddb in mainline for uspace/app/nav/panel.c

Timestamp:

2023-03-08T18:21:22Z (21 months 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/nav/panel.c (modified) (5 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.
  *