Changeset cd62879 in mainline for uspace/lib/ui/src/menuentry.c

Timestamp:

2021-04-01T16:23:35Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Children:

379cd75f

Parents:

bfb055b

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/menuentry.c (modified) (3 diffs)

uspace/lib/ui/src/menuentry.c

@@ -217 +217 @@
         caption = mentry->caption;
 
-        if (mentry == mentry->menu->selected) {
+        if ((mentry->held && mentry->inside) ||
+            mentry == mentry->menu->selected) {
                 fmt.color = res->wnd_sel_text_color;
                 bg_color = res->wnd_sel_text_bg_color;
@@ -249 +250 @@
  *
  * @param mentry Menu entry
- * @param pos Position (top-left corner)
- * @param ppos Press position
- */
-void ui_menu_entry_press(ui_menu_entry_t *mentry, gfx_coord2_t *pos,
-    gfx_coord2_t *ppos)
-{
-        ui_menu_entry_geom_t geom;
-
-        ui_menu_entry_get_geom(mentry, pos, &geom);
-
-        if (gfx_pix_inside_rect(ppos, &geom.outer_rect)) {
-                /* Press inside menu entry */
-
+ * @param pos Menu entry position
+ */
+void ui_menu_entry_press(ui_menu_entry_t *mentry, gfx_coord2_t *pos)
+{
+        if (mentry->held)
+                return;
+
+        mentry->inside = true;
+        mentry->held = true;
+        ui_menu_entry_paint(mentry, pos);
+}
+
+/** Handle button release in menu entry.
+ *
+ * @param mentry Menu entry
+ */
+void ui_menu_entry_release(ui_menu_entry_t *mentry)
+{
+        if (!mentry->held)
+                return;
+
+        mentry->held = false;
+
+        if (mentry->inside) {
                 /* Close menu */
                 ui_menu_bar_select(mentry->menu->mbar,
@@ -270 +282 @@
                         mentry->cb(mentry, mentry->arg);
         }
+}
+
+/** Pointer entered menu entry.
+ *
+ * @param mentry Menu entry
+ * @param pos Menu entry position
+ */
+void ui_menu_entry_enter(ui_menu_entry_t *mentry, gfx_coord2_t *pos)
+{
+        if (mentry->inside)
+                return;
+
+        mentry->inside = true;
+        if (mentry->held)
+                (void) ui_menu_entry_paint(mentry, pos);
+}
+
+/** Pointer left menu entry.
+ *
+ * @param mentry Menu entry
+ * @param pos Menu entry position
+ */
+void ui_menu_entry_leave(ui_menu_entry_t *mentry, gfx_coord2_t *pos)
+{
+        if (!mentry->inside)
+                return;
+
+        mentry->inside = false;
+        if (mentry->held)
+                (void) ui_menu_entry_paint(mentry, pos);
+}
+
+/** Handle menu entry position event.
+ *
+ * @param mentry Menu entry
+ * @param pos Menu entry position (top-left corner)
+ * @param pos_event Position event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_menu_entry_pos_event(ui_menu_entry_t *mentry,
+    gfx_coord2_t *pos, pos_event_t *event)
+{
+        ui_menu_entry_geom_t geom;
+        gfx_coord2_t ppos;
+        bool inside;
+
+        ppos.x = event->hpos;
+        ppos.y = event->vpos;
+
+        ui_menu_entry_get_geom(mentry, pos, &geom);
+        inside = gfx_pix_inside_rect(&ppos, &geom.outer_rect);
+
+        switch (event->type) {
+        case POS_PRESS:
+                if (inside) {
+                        ui_menu_entry_press(mentry, pos);
+                        return ui_claimed;
+                }
+                break;
+        case POS_RELEASE:
+                if (mentry->held) {
+                        ui_menu_entry_release(mentry);
+                        return ui_claimed;
+                }
+                break;
+        case POS_UPDATE:
+                if (inside && !mentry->inside) {
+                        ui_menu_entry_enter(mentry, pos);
+                        return ui_claimed;
+                } else if (!inside && mentry->inside) {
+                        ui_menu_entry_leave(mentry, pos);
+                }
+                break;
+        }
+
+        return ui_unclaimed;
 }