Changeset 0262f16c in mainline

Timestamp:

2021-04-09T22:41:22Z (4 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).

Location:

uspace/lib/ui

Files:

• include/ui/menu.h (modified) (1 diff)
• include/ui/menuentry.h (modified) (1 diff)
• private/menuentry.h (modified) (1 diff)
• src/menu.c (modified) (2 diffs)
• src/menubar.c (modified) (4 diffs)
• src/menuentry.c (modified) (3 diffs)

uspace/lib/ui/include/ui/menu.h

@@ -52 +52 @@
 extern errno_t ui_menu_paint(ui_menu_t *, gfx_coord2_t *);
 extern errno_t ui_menu_unpaint(ui_menu_t *);
-extern void ui_menu_press(ui_menu_t *, gfx_coord2_t *, gfx_coord2_t *);
+extern ui_evclaim_t ui_menu_pos_event(ui_menu_t *, gfx_coord2_t *,
+    pos_event_t *);
 
 #endif

uspace/lib/ui/include/ui/menuentry.h

@@ -53 +53 @@
 extern gfx_coord_t ui_menu_entry_height(ui_menu_entry_t *);
 extern errno_t ui_menu_entry_paint(ui_menu_entry_t *, gfx_coord2_t *);
-extern void ui_menu_entry_press(ui_menu_entry_t *, gfx_coord2_t *,
-    gfx_coord2_t *);
+extern void ui_menu_entry_press(ui_menu_entry_t *, gfx_coord2_t *);
+extern void ui_menu_entry_release(ui_menu_entry_t *);
+extern void ui_menu_entry_enter(ui_menu_entry_t *, gfx_coord2_t *);
+extern void ui_menu_entry_leave(ui_menu_entry_t *, gfx_coord2_t *);
+extern ui_evclaim_t ui_menu_entry_pos_event(ui_menu_entry_t *, gfx_coord2_t *,
+    pos_event_t *);
 
 #endif

uspace/lib/ui/private/menuentry.h

@@ -53 +53 @@
         /** Callbacks */
         ui_menu_entry_cb_t cb;
+        /** Menu entry is currently held down */
+        bool held;
+        /** Pointer is currently inside */
+        bool inside;
         /** Callback argument */
         void *arg;

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

uspace/lib/ui/src/menubar.c

@@ -267 +267 @@
  *
  * @param mbar Menu bar
- * @param ppos Press position
+ * @param pos_event Position event
  * @return @c ui_claimed iff the event is claimed
  */
-static ui_evclaim_t ui_menu_bar_press(ui_menu_bar_t *mbar, gfx_coord2_t *ppos)
+ui_evclaim_t ui_menu_bar_pos_event(ui_menu_bar_t *mbar, pos_event_t *event)
 {
         gfx_coord2_t pos;
@@ -279 +279 @@
         gfx_coord_t width;
         gfx_coord_t hpad;
+        gfx_coord2_t ppos;
+        ui_evclaim_t claimed;
+
+        ppos.x = event->hpos;
+        ppos.y = event->vpos;
 
         if (mbar->res->textmode) {
@@ -298 +303 @@
 
                 /* Check if press is inside menu bar entry */
-                if (gfx_pix_inside_rect(ppos, &rect)) {
+                if (event->type == POS_PRESS &&
+                    gfx_pix_inside_rect(&ppos, &rect)) {
                         ui_menu_bar_select(mbar, &pos, menu);
                         return ui_claimed;
@@ -310 +316 @@
                         ui_menu_get_rect(menu, &spos, &rect);
 
-                        /* Check if press is inside open menu */
-                        if (gfx_pix_inside_rect(ppos, &rect)) {
-                                ui_menu_press(menu, &spos, ppos);
+                        claimed = ui_menu_pos_event(menu, &spos, event);
+                        if (claimed == ui_claimed)
                                 return ui_claimed;
-                        }
                 }
 
                 pos.x += width;
                 menu = ui_menu_next(menu);
-        }
-
-        return ui_unclaimed;
-}
-
-/** Handle menu bar position event.
- *
- * @param mbar Menu bar
- * @param pos_event Position event
- * @return @c ui_claimed iff the event is claimed
- */
-ui_evclaim_t ui_menu_bar_pos_event(ui_menu_bar_t *mbar, pos_event_t *event)
-{
-        gfx_coord2_t pos;
-
-        pos.x = event->hpos;
-        pos.y = event->vpos;
-
-        switch (event->type) {
-        case POS_PRESS:
-                return ui_menu_bar_press(mbar, &pos);
-        default:
-                break;
         }
 

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