Changeset a2f173b in mainline for uspace/lib/ui/src/pbutton.c

Timestamp:

2020-10-21T21:49:13Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58a67050

Parents:

172188a

Message:

Improve close button event routing

Button event processing routine is the best place to determine whether
the event goes to the button or not. It can also 'grab' button release
events simply by claiming them.

File:

• uspace/lib/ui/src/pbutton.c (modified) (3 diffs)

uspace/lib/ui/src/pbutton.c

@@ -350 +350 @@
  * @param pbutton Push button
  * @param pos_event Position event
- */
-void ui_pbutton_pos_event(ui_pbutton_t *pbutton, pos_event_t *event)
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_pbutton_pos_event(ui_pbutton_t *pbutton, pos_event_t *event)
 {
         gfx_coord2_t pos;
@@ -363 +364 @@
         switch (event->type) {
         case POS_PRESS:
-                if (inside)
+                if (inside) {
                         ui_pbutton_press(pbutton);
+                        return ui_claimed;
+                }
                 break;
         case POS_RELEASE:
-                ui_pbutton_release(pbutton);
+                if (pbutton->held) {
+                        ui_pbutton_release(pbutton);
+                        return ui_claimed;
+                }
                 break;
         case POS_UPDATE:
                 if (inside && !pbutton->inside) {
                         ui_pbutton_enter(pbutton);
+                        return ui_claimed;
                 } else if (!inside && pbutton->inside) {
                         ui_pbutton_leave(pbutton);
@@ -377 +384 @@
                 break;
         }
+
+        return ui_unclaimed;
 }