Changeset 1c6c3e1d in mainline for uspace/lib/ui/src/list.c

Timestamp:

2023-10-22T17:55:33Z (17 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

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