1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

PopupMenu: Remove unused function argument

This commit is contained in:
reuk 2025-08-19 10:17:34 +01:00
parent edfa87801c
commit 78a93157de
No known key found for this signature in database

View file

@ -1095,7 +1095,7 @@ struct MenuWindow final : public Component
{ {
const auto parentArea = getParentArea (windowPos.getPosition(), options.getParentComponent()) / scaleFactor; const auto parentArea = getParentArea (windowPos.getPosition(), options.getParentComponent()) / scaleFactor;
if (const auto posAndOffset = computeInitialPosAndOffset (windowPos, parentArea, itemComp.getBounds(), childYOffset, wantedY)) if (const auto posAndOffset = computeInitialPosAndOffset (windowPos, parentArea, itemComp.getBounds(), wantedY))
{ {
std::tie (windowPos, childYOffset) = std::tie (posAndOffset->windowPos, posAndOffset->childYOffset); std::tie (windowPos, childYOffset) = std::tie (posAndOffset->windowPos, posAndOffset->childYOffset);
updateYPositions(); updateYPositions();
@ -1111,7 +1111,6 @@ struct MenuWindow final : public Component
static std::optional<PosAndOffset> computeInitialPosAndOffset (Rectangle<int> windowPos, static std::optional<PosAndOffset> computeInitialPosAndOffset (Rectangle<int> windowPos,
const Rectangle<int>& parentArea, const Rectangle<int>& parentArea,
const Rectangle<int>& itemCompBounds, const Rectangle<int>& itemCompBounds,
int childYOffset,
int wantedY) int wantedY)
{ {
if (windowPos.getHeight() <= PopupMenuSettings::scrollZone * 4 if (windowPos.getHeight() <= PopupMenuSettings::scrollZone * 4
@ -1135,10 +1134,9 @@ struct MenuWindow final : public Component
parentArea.getBottom() - windowPos.getHeight(), parentArea.getBottom() - windowPos.getHeight(),
deltaY); deltaY);
childYOffset -= (deltaY - newY);
windowPos.setPosition (windowPos.getX(), newY); windowPos.setPosition (windowPos.getX(), newY);
return PosAndOffset { windowPos, childYOffset }; return PosAndOffset { windowPos, newY - deltaY };
} }
void resizeToBestWindowPos() void resizeToBestWindowPos()