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: Simplify expressions in ensureItemComponentIsVisible()

Browse source
This commit is contained in:
reuk 2025-08-18 22:02:42 +01:00
parent 41a6ed37e4
commit d2cb90cded
No known key found for this signature in database
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1105,19 +1105,17 @@ struct MenuWindow final : public Component
windowPos.getHeight() - (PopupMenuSettings::scrollZone + itemComp.getHeight())),
itemComp.getY());
auto parentArea = getParentArea (windowPos.getPosition(), options.getParentComponent()) / scaleFactor;
auto deltaY = wantedY - itemComp.getY();
const auto parentArea = getParentArea (windowPos.getPosition(), options.getParentComponent()) / scaleFactor;
const auto deltaY = windowPos.getY() + 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);
const auto newY = jlimit (parentArea.getY(),
parentArea.getBottom() - windowPos.getHeight(),
deltaY);
deltaY -= newY - windowPos.getY();
childYOffset -= deltaY;
childYOffset -= (deltaY - newY);
windowPos.setPosition (windowPos.getX(), newY);
updateYPositions();