Changeset f9c4c433 in mainline for uspace/lib/ui/src

Timestamp:

2025-09-16T13:02:37Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

283bb9f, ff4d31c

Parents:

113fb4f

Message:

Create new file in Navigator (WIP)

Location:

uspace/lib/ui/src

Files:

• filelist.c (modified) (3 diffs)
• list.c (modified) (2 diffs)
• msgdialog.c (modified) (4 diffs)

uspace/lib/ui/src/filelist.c

@@ -349 +349 @@
                 goto error;
         }
+
+        ui_file_list_clear_entries(flist);
 
         if (str_cmp(ndir, "/") != 0) {
@@ -422 +424 @@
 }
 
+/** Re-read file list from directory.
+ *
+ * @param flist File list
+ * @return EOK on success or an error code
+ */
+errno_t ui_file_list_refresh(ui_file_list_t *flist)
+{
+        errno_t rc;
+        ui_list_pos_t pos;
+
+        ui_list_save_pos(flist->list, &pos);
+        rc = ui_file_list_read_dir(flist, flist->dir);
+        if (rc != EOK)
+                return rc;
+        ui_list_restore_pos(flist->list, &pos);
+        return EOK;
+}
+
 /** Sort file list entries.
  *
@@ -593 +613 @@
                 return ENOMEM;
 
-        ui_file_list_clear_entries(flist);
-
         rc = ui_file_list_read_dir(flist, dirname);
         if (rc != EOK) {

uspace/lib/ui/src/list.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -1652 +1652 @@
 }
 
+/** Save list position for later.
+ *
+ * The position will be valid even if the list is cleaned and re-populated
+ * (it just counts position from the top.)
+ *
+ * @param list UI list
+ * @param pos Place to store position
+ */
+void ui_list_save_pos(ui_list_t *list, ui_list_pos_t *pos)
+{
+        pos->page_idx = list->page_idx;
+        pos->cursor_idx = list->cursor_idx;
+}
+
+/** Restore saved list position.
+ *
+ * The position will be valid even if the list is cleaned and re-populated
+ * (it just counts position from the top.)
+ *
+ * @param list UI list
+ * @param pos Saved list position
+ */
+void ui_list_restore_pos(ui_list_t *list, ui_list_pos_t *pos)
+{
+        size_t idx, i;
+        ui_list_entry_t *entry, *next;
+
+        idx = 0;
+        entry = ui_list_first(list);
+
+        for (i = 0; i < pos->cursor_idx; i++) {
+                next = ui_list_next(entry);
+                if (next != NULL) {
+                        entry = next;
+                        ++idx;
+                }
+        }
+
+        list->cursor = entry;
+        list->cursor_idx = idx;
+
+        idx = 0;
+        entry = ui_list_first(list);
+
+        for (i = 0; i < pos->page_idx; i++) {
+                next = ui_list_next(entry);
+                if (next != NULL) {
+                        entry = next;
+                        ++idx;
+                }
+        }
+
+        list->page = entry;
+        list->page_idx = idx;
+}
+
 /** @}
  */

uspace/lib/ui/src/msgdialog.c

@@ -285 +285 @@
         if (dialog->cb != NULL && dialog->cb->close != NULL)
                 dialog->cb->close(dialog, dialog->arg);
+        else
+                ui_msg_dialog_destroy(dialog);
 }
 
@@ -310 +312 @@
                                 dialog->cb->button(dialog, dialog->arg, 0);
                                 return;
+                        } else {
+                                ui_msg_dialog_destroy(dialog);
                         }
                 } else if (event->key == KC_ESCAPE) {
@@ -316 +320 @@
                                 dialog->cb->close(dialog, dialog->arg);
                                 return;
+                        } else {
+                                ui_msg_dialog_destroy(dialog);
                         }
                 }
@@ -337 +343 @@
                                 dialog->cb->button(dialog, dialog->arg, i);
                 }
+        } else {
+                ui_msg_dialog_destroy(dialog);
         }
 }