Changeset e0377075 in mainline for uspace/app/nav/panel.c

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

9ee55cd

Parents:

39ab17c

git-author:

Jiri Svoboda <jiri@…> (2021-10-22 18:25:44)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Select entry using the mouse

File:

• uspace/app/nav/panel.c (modified) (3 diffs)

uspace/app/nav/panel.c

@@ -324 +324 @@
 {
         gfx_coord2_t pos;
+        gfx_rect_t irect;
+        panel_entry_t *entry;
+        size_t entry_idx;
+        int n;
 
         pos.x = event->hpos;
@@ -330 +334 @@
                 return ui_unclaimed;
 
-        if (!panel->active) {
+        if (!panel->active && event->type == POS_PRESS)
                 panel_activate_req(panel);
+
+        if (event->type == POS_PRESS) {
+                irect.p0.x = panel->rect.p0.x + 1;
+                irect.p0.y = panel->rect.p0.y + 1;
+                irect.p1.x = panel->rect.p1.x - 1;
+                irect.p1.y = panel->rect.p1.y - 1;
+
+                /* Did we click on one of the entries? */
+                if (gfx_pix_inside_rect(&pos, &irect)) {
+                        /* Index within page */
+                        n = pos.y - irect.p0.y;
+
+                        /* Entry and its index within entire listing */
+                        entry = panel_page_nth_entry(panel, n, &entry_idx);
+
+                        /* Move to the entry found */
+                        panel_cursor_move(panel, entry, entry_idx);
+                }
         }
 
@@ -800 +822 @@
 }
 
+/** Find the n-th entry of the current panel page.
+ *
+ * If the page is short and has less than n+1 entries, return the last entry.
+ *
+ * @param panel Panel
+ * @param n Which entry to get (starting from 0)
+ * @param ridx Place to store index (within listing) of the entry
+ * @return n-th entry of the page
+ */
+panel_entry_t *panel_page_nth_entry(panel_t *panel, size_t n, size_t *ridx)
+{
+        panel_entry_t *entry;
+        panel_entry_t *next;
+        size_t i;
+        size_t idx;
+
+        assert(n < panel_page_size(panel));
+
+        entry = panel->page;
+        idx = panel->page_idx;
+        for (i = 0; i < n; i++) {
+                next = panel_next(entry);
+                if (next == NULL)
+                        break;
+
+                entry = next;
+                ++idx;
+        }
+
+        *ridx = idx;
+        return entry;
+}
+
 /** Move cursor to a new position, possibly scrolling.
  *