| | 1543 | #define NAV_AREA_THRESHOLD 8 |
| | 1544 | |
| | 1545 | // The navigation area is a region in which mouse-overs won't select |
| | 1546 | // the item under the cursor. This makes it easier to navigate to |
| | 1547 | // submenus, as the cursor can be moved to submenu items directly instead |
| | 1548 | // of having to move it horizontally into the submenu first. The concept |
| | 1549 | // is illustrated below: |
| | 1550 | // |
| | 1551 | // +-------+----+---------+ |
| | 1552 | // | | /| | |
| | 1553 | // | | /*| | |
| | 1554 | // |[2]--> | /**| | |
| | 1555 | // | |/[4]| | |
| | 1556 | // |------------| | |
| | 1557 | // | [1] | [6] | |
| | 1558 | // |------------| | |
| | 1559 | // | |\[5]| | |
| | 1560 | // |[3]--> | \**| | |
| | 1561 | // | | \*| | |
| | 1562 | // | | \| | |
| | 1563 | // | +----|---------+ |
| | 1564 | // | | |
| | 1565 | // +------------+ |
| | 1566 | // |
| | 1567 | // [1] Selected item, cursor position ('position') |
| | 1568 | // [2] Upper navigation area rectangle ('navAreaRectAbove') |
| | 1569 | // [3] Lower navigation area rectangle ('navAreaRectBelow') |
| | 1570 | // [4] Upper navigation area |
| | 1571 | // [5] Lower navigation area |
| | 1572 | // [6] Submenu |
| | 1573 | // |
| | 1574 | // The rectangles are used to calculate if the cursor is in the actual |
| | 1575 | // navigation area (see _UpdateStateOpenSelect()). |
| | 1576 | |
| | 1577 | if (fSelected == NULL) |
| | 1578 | return; |
| | 1579 | |
| | 1580 | BMenu *submenu = fSelected->Submenu(); |
| | 1581 | |
| | 1582 | if (submenu != NULL) { |
| | 1583 | BRect menuBounds = ConvertToScreen(Bounds()); |
| | 1584 | |
| | 1585 | fSelected->Submenu()->LockLooper(); |
| | 1586 | BRect submenuBounds = fSelected->Submenu()->ConvertToScreen( |
| | 1587 | fSelected->Submenu()->Bounds()); |
| | 1588 | fSelected->Submenu()->UnlockLooper(); |
| | 1589 | |
| | 1590 | if (menuBounds.left < submenuBounds.left) { |
| | 1591 | navAreaRectAbove.Set(position.x + NAV_AREA_THRESHOLD, |
| | 1592 | submenuBounds.top, menuBounds.right, |
| | 1593 | position.y); |
| | 1594 | navAreaRectBelow.Set(position.x + NAV_AREA_THRESHOLD, |
| | 1595 | position.y, menuBounds.right, |
| | 1596 | submenuBounds.bottom); |
| | 1597 | } else { |
| | 1598 | navAreaRectAbove.Set(menuBounds.left, |
| | 1599 | submenuBounds.top, position.x - NAV_AREA_THRESHOLD, |
| | 1600 | position.y); |
| | 1601 | navAreaRectBelow.Set(menuBounds.left, |
| | 1602 | position.y, position.x - NAV_AREA_THRESHOLD, |
| | 1603 | submenuBounds.bottom); |
| | 1604 | } |
| | 1605 | position.PrintToStream(); |
| | 1606 | navAreaRectAbove.PrintToStream(); |
| | 1607 | navAreaRectBelow.PrintToStream(); |
| | 1608 | printf("\n"); |
| | 1609 | } else { |
| | 1610 | navAreaRectAbove = BRect(); |
| | 1611 | navAreaRectBelow = BRect(); |
| | 1612 | } |
| | 1613 | } |
| | 1614 | |
| | 1615 | void |
| | 1616 | BMenu::_UpdateStateOpenSelect(BMenuItem* item, BPoint position, |
| | 1617 | BRect& navAreaRectAbove, BRect& navAreaRectBelow, bigtime_t& selectedTime, |
| | 1618 | bigtime_t& navigationAreaTime) |
| | 1619 | { |
| 1540 | | openTime = system_time(); |
| | 1635 | navAreaRectAbove = BRect(); |
| | 1636 | navAreaRectBelow = BRect(); |
| | 1637 | selectedTime = system_time(); |
| | 1638 | navigationAreaTime = 0; |
| | 1639 | return; |
| | 1640 | } |
| | 1641 | |
| | 1642 | BRect menuBounds = ConvertToScreen(Bounds()); |
| | 1643 | |
| | 1644 | fSelected->Submenu()->LockLooper(); |
| | 1645 | BRect submenuBounds = fSelected->Submenu()->ConvertToScreen( |
| | 1646 | fSelected->Submenu()->Bounds()); |
| | 1647 | fSelected->Submenu()->UnlockLooper(); |
| | 1648 | |
| | 1649 | float x_offset; |
| | 1650 | |
| | 1651 | // navAreaRectAbove and navAreaRectBelow have the same X |
| | 1652 | // position and width, so it doesn't matter which one we use to |
| | 1653 | // calculate the X offset |
| | 1654 | if (menuBounds.left < submenuBounds.left) |
| | 1655 | x_offset = position.x - navAreaRectAbove.left; |
| | 1656 | else |
| | 1657 | x_offset = navAreaRectAbove.right - position.x; |
| | 1658 | |
| | 1659 | bool inNavArea; |
| | 1660 | |
| | 1661 | if (inNavAreaRectAbove) { |
| | 1662 | float y_offset = navAreaRectAbove.bottom - position.y; |
| | 1663 | float ratio = navAreaRectAbove.Width() / navAreaRectAbove.Height(); |
| | 1664 | |
| | 1665 | inNavArea = y_offset <= x_offset / ratio; |
| 1544 | | } else if (system_time() > kHysteresis + openTime && item->Submenu() != NULL |
| 1545 | | && item->Submenu()->Window() == NULL) { |
| 1546 | | // Open the submenu if it's not opened yet, but only if |
| 1547 | | // the mouse pointer stayed over there for some time |
| 1548 | | // (hysteresis) |
| 1549 | | _SelectItem(item); |
| | 1672 | |
| | 1673 | bigtime_t systime = system_time(); |
| | 1674 | |
| | 1675 | if (!inNavArea || (navigationAreaTime > 0 && systime - |
| | 1676 | navigationAreaTime > kNavigationAreaTimeout)) { |
| | 1677 | // Don't delay opening of submenu if the user had |
| | 1678 | // to wait for the navigation area timeout anyway |
| | 1679 | _SelectItem(item, inNavArea); |
| | 1680 | |
| | 1681 | if (inNavArea) { |
| | 1682 | _UpdateNavigationArea(position, navAreaRectAbove, |
| | 1683 | navAreaRectBelow); |
| | 1684 | } else { |
| | 1685 | navAreaRectAbove = BRect(); |
| | 1686 | navAreaRectBelow = BRect(); |
| | 1687 | } |
| | 1688 | |
| | 1689 | selectedTime = system_time(); |
| | 1690 | navigationAreaTime = 0; |
| | 1691 | } |
| | 1692 | } else if (fSelected->Submenu() != NULL && |
| | 1693 | system_time() - selectedTime > kOpenSubmenuDelay) { |
| | 1694 | _SelectItem(fSelected, true); |
| | 1695 | |
| | 1696 | if (!navAreaRectAbove.IsValid() && !navAreaRectBelow.IsValid()) { |
| | 1697 | position = ConvertToScreen(position); |
| | 1698 | _UpdateNavigationArea(position, navAreaRectAbove, navAreaRectBelow); |
| | 1699 | } |
