Changeset 1543d4c in mainline
- Timestamp:
- 2023-10-16T17:47:29Z (14 months ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4030072
- Parents:
- 9e240c1
- Location:
- uspace
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/menubar.c
r9e240c1 r1543d4c 563 563 mbar->active = true; 564 564 565 /* Open the menu, close if already open. */ 566 if (mdd == mbar->selected) 567 ui_menu_bar_select(mbar, NULL, false, pos_id); 568 else 565 /* Open the menu, if not already open. */ 566 if (mdd != mbar->selected) 569 567 ui_menu_bar_select(mbar, mdd, true, pos_id); 570 568 -
uspace/srv/hid/display/seat.c
r9e240c1 r1543d4c 515 515 wnd = ds_display_window_by_pos(seat->display, &seat->pntpos); 516 516 517 /* Click outside popup window */518 if (event->type == POS_PRESS && wnd != seat->popup) {519 /* Close popup window */520 ds_seat_set_popup(seat, NULL);521 }522 523 517 /* Deliver event to popup window. */ 524 if (seat->popup != NULL ) {518 if (seat->popup != NULL && event->type != POS_PRESS) { 525 519 rc = ds_window_post_pos_event(seat->popup, event); 526 520 if (rc != EOK) … … 546 540 * to the same window above. 547 541 */ 548 if (wnd != seat->popup ) {542 if (wnd != seat->popup || event->type == POS_PRESS) { 549 543 rc = ds_window_post_pos_event(wnd, event); 550 544 if (rc != EOK) … … 556 550 } 557 551 552 /* Click outside popup window */ 553 if (event->type == POS_PRESS && wnd != seat->popup) { 554 /* Close popup window */ 555 ds_seat_set_popup(seat, NULL); 556 } 557 558 558 return EOK; 559 559 }
Note:
See TracChangeset
for help on using the changeset viewer.