Changeset a77c722 in mainline

Timestamp:

2023-08-08T16:25:27Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

acd7ac2

Parents:

8a4ceaa

Message:

Update page_idx and cursor_idx after deleting UI list entry

File:

• uspace/lib/ui/src/list.c (modified) (2 diffs)

uspace/lib/ui/src/list.c

@@ -738 +738 @@
 void ui_list_entry_delete(ui_list_entry_t *entry)
 {
-        /* Try to make sure entry does not disappear between cursor and page */
+        ui_list_t *list = entry->list;
+
+        /* Try to make sure entry does not disappear under cursor or page */
         if (entry->list->cursor == entry)
                 ui_list_cursor_up(entry->list);
@@ -749 +751 @@
 
         ui_list_entry_destroy(entry);
+
+        /*
+         * But it could still happen if there are not enough entries.
+         * In that case just move page and/or cursor to the first
+         * entry.
+         */
+        if (list->page == NULL) {
+                list->page = ui_list_first(list);
+                list->page_idx = 0;
+        } else {
+                /*
+                 * Entry index might have changed if earlier entry
+                 * was deleted.
+                 */
+                list->page_idx = ui_list_entry_get_idx(list->page);
+        }
+
+        if (list->cursor == NULL) {
+                list->cursor = ui_list_first(list);
+                list->cursor_idx = 0;
+        } else {
+                /*
+                 * Entry index might have changed if earlier entry
+                 * was deleted.
+                 */
+                list->cursor_idx = ui_list_entry_get_idx(list->cursor);
+        }
 }