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

Timestamp:

2021-04-01T16:23:35Z (4 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/menubar.c (modified) (4 diffs)

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