Changeset fdf55a3 in mainline

Timestamp:

2022-06-02T19:13:12Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

453f9645

Parents:

03fc3a9

Message:

Do not select/open last entry if user clicks below

This behavior, meticulously copied from NC, is not really meaningful,
especially considering other circumstances. We also did it for double
click / open, which is very confusing.

Location:

uspace/lib/ui

Files:

• src/filelist.c (modified) (3 diffs)
• test/filelist.c (modified) (2 diffs)

uspace/lib/ui/src/filelist.c

@@ -934 +934 @@
 /** Find the n-th entry of the current file list page.
  *
- * If the page is short and has less than n+1 entries, return the last entry.
- *
  * @param flist File list
  * @param n Which entry to get (starting from 0)
@@ -945 +943 @@
 {
         ui_file_list_entry_t *entry;
-        ui_file_list_entry_t *next;
         size_t i;
         size_t idx;
@@ -957 +954 @@
         idx = flist->page_idx;
         for (i = 0; i < n; i++) {
-                next = ui_file_list_next(entry);
-                if (next == NULL)
-                        break;
-
-                entry = next;
+                entry = ui_file_list_next(entry);
+                if (entry == NULL)
+                        return NULL;
+
                 ++idx;
         }

uspace/lib/ui/test/filelist.c

@@ -283 +283 @@
         PCUT_ASSERT_INT_EQUALS(2, flist->cursor->size);
 
-        /* Clicking below the last entry should select it */
-        event.hpos = 20;
-        event.vpos = 200;
-        claimed = ui_file_list_pos_event(flist, &event);
-        PCUT_ASSERT_EQUALS(ui_claimed, claimed);
-
-        PCUT_ASSERT_NOT_NULL(flist->cursor);
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-
         /* Clicking on the top edge should do a page-up */
         event.hpos = 20;
@@ -1014 +1004 @@
 
         entry = ui_file_list_page_nth_entry(flist, 0, &idx);
+        PCUT_ASSERT_NOT_NULL(entry);
         PCUT_ASSERT_STR_EQUALS("b", entry->name);
         PCUT_ASSERT_INT_EQUALS(1, idx);
 
         entry = ui_file_list_page_nth_entry(flist, 1, &idx);
+        PCUT_ASSERT_NOT_NULL(entry);
         PCUT_ASSERT_STR_EQUALS("c", entry->name);
         PCUT_ASSERT_INT_EQUALS(2, idx);
 
         entry = ui_file_list_page_nth_entry(flist, 2, &idx);
-        PCUT_ASSERT_STR_EQUALS("c", entry->name);
-        PCUT_ASSERT_INT_EQUALS(2, idx);
-
-        entry = ui_file_list_page_nth_entry(flist, 3, &idx);
-        PCUT_ASSERT_STR_EQUALS("c", entry->name);
-        PCUT_ASSERT_INT_EQUALS(2, idx);
+        PCUT_ASSERT_NULL(entry);
 
         ui_file_list_destroy(flist);