mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

PopupMenu: Use early return in ensureItemComponentIsVisible()

Browse source
This commit is contained in:
reuk 2025-08-18 21:52:09 +01:00
parent 9b226f93f4
commit 41a6ed37e4
No known key found for this signature in database
1 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

54
modules/juce_gui_basics/menus/juce_PopupMenu.cpp
View file

@ -1093,36 +1093,34 @@ struct MenuWindow final : public Component
void ensureItemComponentIsVisible (const ItemComponent& itemComp, int wantedY)
{
if (windowPos.getHeight() > PopupMenuSettings::scrollZone * 4)
if (windowPos.getHeight() <= PopupMenuSettings::scrollZone * 4
|| (wantedY <= 0 && 0 <= itemComp.getY() && itemComp.getBottom() <= windowPos.getHeight()))
{
auto currentY = itemComp.getY();
if (wantedY > 0 || currentY < 0 || itemComp.getBottom() > windowPos.getHeight())
{
if (wantedY < 0)
wantedY = jlimit (PopupMenuSettings::scrollZone,
jmax (PopupMenuSettings::scrollZone,
windowPos.getHeight() - (PopupMenuSettings::scrollZone + itemComp.getHeight())),
currentY);
auto parentArea = getParentArea (windowPos.getPosition(), options.getParentComponent()) / scaleFactor;
auto deltaY = wantedY - currentY;
windowPos.setSize (jmin (windowPos.getWidth(), parentArea.getWidth()),
jmin (windowPos.getHeight(), parentArea.getHeight()));
auto newY = jlimit (parentArea.getY(),
parentArea.getBottom() - windowPos.getHeight(),
windowPos.getY() + deltaY);
deltaY -= newY - windowPos.getY();
childYOffset -= deltaY;
windowPos.setPosition (windowPos.getX(), newY);
updateYPositions();
}
return;
}
if (wantedY < 0)
wantedY = jlimit (PopupMenuSettings::scrollZone,
jmax (PopupMenuSettings::scrollZone,
windowPos.getHeight() - (PopupMenuSettings::scrollZone + itemComp.getHeight())),
itemComp.getY());
auto parentArea = getParentArea (windowPos.getPosition(), options.getParentComponent()) / scaleFactor;
auto deltaY = wantedY - itemComp.getY();
windowPos.setSize (jmin (windowPos.getWidth(), parentArea.getWidth()),
jmin (windowPos.getHeight(), parentArea.getHeight()));
auto newY = jlimit (parentArea.getY(),
parentArea.getBottom() - windowPos.getHeight(),
windowPos.getY() + deltaY);
deltaY -= newY - windowPos.getY();
childYOffset -= deltaY;
windowPos.setPosition (windowPos.getX(), newY);
updateYPositions();
}
void resizeToBestWindowPos()