Changeset f536a16 in mainline

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:

f0ccb2a

Parents:

f251883

git-author:

Jiri Svoboda <jiri@…> (2021-04-01 22:31:15)

git-committer:

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

Message:

Close menu when button is pressed outside of it

File:

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

uspace/lib/ui/src/menu.c

@@ -273 +273 @@
 }
 
-/** Handle button press in menu.
+/** Handle position event in menu.
  *
  * @param menu Menu
@@ -305 +305 @@
         }
 
-        if (gfx_pix_inside_rect(&epos, &geom.outer_rect))
+        /* Event inside menu? */
+        if (gfx_pix_inside_rect(&epos, &geom.outer_rect)) {
+                /* Claim event */
                 return ui_claimed;
+        } else {
+                /* Press outside menu - close it */
+                if (event->type == POS_PRESS)
+                        ui_menu_bar_select(menu->mbar, NULL, NULL);
+        }
 
         return ui_unclaimed;