From d2cb90cdeda32123624041d05464540c78693547 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Mon, 18 Aug 2025 22:02:42 +0100
Subject: [PATCH] PopupMenu: Simplify expressions in
 ensureItemComponentIsVisible()

---
 modules/juce_gui_basics/menus/juce_PopupMenu.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
index 752617ec90..264eb86fd5 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
@@ -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();