Changeset 0262f16c in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2021-04-09T22:41:22Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

62223ec

Parents:

214aefb

git-author:

Jiri Svoboda <jiri@…> (2021-04-01 16:23:35)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-04-09 22:41:22)

Message:

Activate menu entry by clicking (instead of simple press)

This allows for visual feedback and also serves as the confirmation
of correctness/intent (same as with push button).

File:

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

uspace/lib/ui/src/menu.c

@@ -292 +292 @@
  * @param menu Menu
  * @param spos Starting position (top-left corner)
- * @param ppos Press position
- */
-void ui_menu_press(ui_menu_t *menu, gfx_coord2_t *spos, gfx_coord2_t *ppos)
+ * @param event Position event
+ * @return ui_claimed iff the event was claimed
+ */
+ui_evclaim_t ui_menu_pos_event(ui_menu_t *menu, gfx_coord2_t *spos,
+    pos_event_t *event)
 {
         ui_menu_geom_t geom;
         ui_menu_entry_t *mentry;
         gfx_coord2_t pos;
+        gfx_coord2_t epos;
+        ui_evclaim_t claimed;
 
         ui_menu_get_geom(menu, spos, &geom);
+        epos.x = event->hpos;
+        epos.y = event->vpos;
 
         pos = geom.entries_rect.p0;
@@ -306 +312 @@
         mentry = ui_menu_entry_first(menu);
         while (mentry != NULL) {
-                ui_menu_entry_press(mentry, &pos, ppos);
+                claimed = ui_menu_entry_pos_event(mentry, &pos, event);
+                if (claimed == ui_claimed)
+                        return ui_claimed;
 
                 pos.y += ui_menu_entry_height(mentry);
                 mentry = ui_menu_entry_next(mentry);
         }
+
+        if (gfx_pix_inside_rect(&epos, &geom.outer_rect))
+                return ui_claimed;
+
+        return ui_unclaimed;
 }