Changeset a2f173b in mainline for uspace/lib/ui/test/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/test/pbutton.c (modified) (2 diffs)

uspace/lib/ui/test/pbutton.c

@@ -359 +359 @@
         ui_resource_t *resource = NULL;
         ui_pbutton_t *pbutton;
+        ui_evclaim_t claim;
         pos_event_t event;
         gfx_rect_t rect;
@@ -381 +382 @@
         ui_pbutton_set_rect(pbutton, &rect);
 
-        /* Press outside does nothing */
+        /* Press outside is not claimed and does nothing */
         event.type = POS_PRESS;
         event.hpos = 9;
         event.vpos = 20;
-        ui_pbutton_pos_event(pbutton, &event);
-        PCUT_ASSERT_FALSE(pbutton->held);
-
-        /* Press inside depresses button */
+        claim = ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_FALSE(pbutton->held);
+        PCUT_ASSERT_EQUALS(ui_unclaimed, claim);
+
+        /* Press inside is claimed and depresses button */
         event.type = POS_PRESS;
         event.hpos = 10;
         event.vpos = 20;
-        ui_pbutton_pos_event(pbutton, &event);
-        PCUT_ASSERT_TRUE(pbutton->held);
-
-        /* Release outside (or anywhere) relases button */
+        claim = ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_TRUE(pbutton->held);
+        PCUT_ASSERT_EQUALS(ui_claimed, claim);
+
+        /* Release outside (or anywhere) is claimed and relases button */
         event.type = POS_RELEASE;
         event.hpos = 9;
         event.vpos = 20;
-        ui_pbutton_pos_event(pbutton, &event);
-        PCUT_ASSERT_FALSE(pbutton->held);
+        claim = ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_FALSE(pbutton->held);
+        PCUT_ASSERT_EQUALS(ui_claimed, claim);
 
         ui_pbutton_destroy(pbutton);