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

Timestamp:

2020-10-21T21:49:13Z (4 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/wdecor.c (modified) (2 diffs)

uspace/lib/ui/src/wdecor.c

@@ -280 +280 @@
         gfx_coord2_t pos;
         ui_wdecor_geom_t geom;
+        ui_evclaim_t claim;
 
         pos.x = event->hpos;
@@ -286 +287 @@
         ui_wdecor_get_geom(wdecor, &geom);
 
-        if (gfx_pix_inside_rect(&pos, &geom.btn_close_rect)) {
-                ui_pbutton_pos_event(wdecor->btn_close, event);
+        claim = ui_pbutton_pos_event(wdecor->btn_close, event);
+        if (claim == ui_claimed)
                 return;
-        }
 
         if (event->type == POS_PRESS &&