fix popup menu and tooltip scaling when loaded as a plugin

Author: sadguitarius

Source/Components/ArrowPopupMenu.h

@@ -49,12 +49,13 @@ class ArrowPopupMenu final : public Component
             menuToAttachTo->setBounds(menuToAttachTo->getBounds().translated(-15, menuMargin - 3));
         } else {
             // adjust the popupMenu to be in the correct y position
-            auto const menuBounds = menuToAttachTo->getScreenBounds().reduced(menuMargin + 5);
-            auto const targetBounds = targetComponent->getScreenBounds();
+            auto const menuBounds = menuToAttachTo->getBounds().reduced(menuMargin + 5);
+            auto const targetBounds = targetComponent->getBounds();
 
-            auto const yOffset = targetBounds.getBottom() - menuBounds.getBottom();
+            // TODO: this was totally broken as is for some reason so for now it's hard coded
+            int const yOffset = static_cast<int>(static_cast<float>(targetBounds.getBottom() - menuBounds.getBottom()) / getApproximateScaleFactorForComponent(menuToAttachTo));
 
-            menuToAttachTo->setBounds(menuToAttachTo->getBounds().translated(20, yOffset));
+            menuToAttachTo->setBounds(menuToAttachTo->getBounds().translated(30, -40));
         }
     }
 

Source/Components/CheckedTooltip.h

@@ -19,11 +19,6 @@ class CheckedTooltip final : public TooltipWindow {
     {
     }
 
-    float getDesktopScaleFactor() const override
-    {
-        return Component::getDesktopScaleFactor();
-    }
-
     void setVisible(bool const shouldBeVisible) override
     {
         if (shouldBeVisible && !isVisible()) {

Source/PluginEditor.cpp

@@ -61,7 +61,7 @@ class CalloutArea final : public Component
 
     void timerCallback() override
     {
-        setBounds(target->getScreenBounds());
+        setBounds(target->getScreenBounds() / getDesktopScaleFactor());
     }
 
     void paint(Graphics& g) override
@@ -71,6 +71,12 @@ class CalloutArea final : public Component
         }
     }
 
+
+    float getDesktopScaleFactor() const override
+    {
+        return getApproximateScaleFactorForComponent(target);
+    };
+
 private:
     WeakReference<Component> target;
     TooltipWindow tooltipWindow;

Source/Sidebar/Console.h

@@ -211,7 +211,7 @@ class Console final : public Component
                         auto* editor = findParentComponentOfClass<PluginEditor>();
                         editor->highlightSearchTarget(target, true);
                     });
-                    menu.showMenuAsync(PopupMenu::Options());
+                    menu.showMenuAsync(PopupMenu::Options().withTargetComponent(this));
                 }
 
                 if (e.mods.isShiftDown()) {
@@ -473,7 +473,8 @@ class Console final : public Component
         settingsCalloutButton->onClick = [this, settingsCalloutButton] {
             auto consoleSettings = std::make_unique<ConsoleSettings>(settingsValues);
             auto const bounds = settingsCalloutButton->getScreenBounds();
-            CallOutBox::launchAsynchronously(std::move(consoleSettings), bounds, nullptr);
+            auto* pluginEditor = findParentComponentOfClass<PluginEditor>();
+            pluginEditor->showCalloutBox(std::move(consoleSettings), bounds);
         };
 
         return std::unique_ptr<TextButton>(settingsCalloutButton);

Source/Sidebar/DocumentationBrowser.h

@@ -457,7 +457,7 @@ class DocumentationBrowser final : public Component
             };
 
             auto docsSettings = std::make_unique<DocumentBrowserSettings>(openFolderCallback, resetFolderCallback);
-            CallOutBox::launchAsynchronously(std::move(docsSettings), bounds, nullptr);
+            editor->showCalloutBox(std::move(docsSettings), bounds);
         };
 
         return std::unique_ptr<TextButton>(settingsCalloutButton);

Source/Sidebar/Palettes.h

@@ -376,7 +376,8 @@ class PaletteSelector final : public TextButton {
             PopupMenu menu;
             menu.addItem("Export palette", exportClicked);
             menu.addItem("Delete palette", deleteClicked);
-            menu.showMenuAsync(PopupMenu::Options());
+            auto const position = e.getScreenPosition();
+            menu.showMenuAsync(PopupMenu::Options().withTargetComponent(this).withTargetScreenArea(Rectangle<int>(position, position.translated(1, 1))));
         }
 
         TextButton::mouseDown(e);

Source/Sidebar/SearchPanel.h

@@ -31,7 +31,8 @@ class OpenInspector final : public Component {
         buttonOpenInspector.setColour(TextButton::buttonOnColourId, backgroundColour.contrasting(0.1f));
         buttonOpenInspector.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
         buttonOpenInspector.setButtonText("Open inspector");
-        buttonOpenInspector.setTooltip("Open inspector for object");
+        // TODO: something is probably wrong with the presentation of this popup overall, but the tooltip seems redundant
+        // buttonOpenInspector.setTooltip("Open inspector for object");
 
         addAndMakeVisible(buttonOpenInspector);
 
@@ -185,11 +186,9 @@ class SearchPanel final : public Component
 
             auto openInspector = std::make_unique<OpenInspector>();
             auto* rawOpenInspectorPtr = openInspector.get();
-            auto& callOutBox = CallOutBox::launchAsynchronously(std::move(openInspector), bounds, nullptr);
+            currentCalloutBox = &editor->showCalloutBox(std::move(openInspector), bounds);
 
-            SafePointer<CallOutBox> callOutBoxSafePtr(&callOutBox);
-
-            auto onClick = [this, ptr, callOutBoxSafePtr] {
+            auto onClick = [this, ptr] {
                 if (auto obj = editor->highlightSearchTarget(ptr, true)) {
                     // FIXME: We have to wait until EVERYTHING has setup on the new canvas
                     // So we call it on message thread, which should place this event after the previous
@@ -201,8 +200,8 @@ class SearchPanel final : public Component
                     };
                     MessageManager::callAsync(launchInspector);
                 }
-                if (callOutBoxSafePtr)
-                    callOutBoxSafePtr->dismiss();
+                if (currentCalloutBox)
+                    currentCalloutBox->dismiss();
             };
 
             rawOpenInspectorPtr->setButtonOnClick(onClick);
@@ -278,15 +277,16 @@ class SearchPanel final : public Component
         Fonts::drawIcon(g, Icons::Search, 2, 1, 32, colour, 12);
     }
 
-    static std::unique_ptr<Component> getExtraSettingsComponent()
+    std::unique_ptr<Component> getExtraSettingsComponent()
     {
         auto* settingsCalloutButton = new SmallIconButton(Icons::More);
+        auto* pluginEditor = findParentComponentOfClass<PluginEditor>();
         settingsCalloutButton->setTooltip("Show search settings");
         settingsCalloutButton->setConnectedEdges(12);
-        settingsCalloutButton->onClick = [settingsCalloutButton] {
+        settingsCalloutButton->onClick = [settingsCalloutButton, pluginEditor] {
             auto const bounds = settingsCalloutButton->getScreenBounds();
             auto docsSettings = std::make_unique<SearchPanelSettings>();
-            CallOutBox::launchAsynchronously(std::move(docsSettings), bounds, nullptr);
+            pluginEditor->showCalloutBox(std::move(docsSettings), bounds);
         };
 
         return std::unique_ptr<TextButton>(settingsCalloutButton);
@@ -688,4 +688,6 @@ class SearchPanel final : public Component
     PluginEditor* editor;
     ValueTreeViewerComponent patchTree = ValueTreeViewerComponent("(Subpatch)");
     SearchEditor input;
+private:
+    static inline SafePointer<CallOutBox> currentCalloutBox = nullptr;
 };

Source/TabComponent.h

@@ -269,7 +269,8 @@ class TabComponent final : public Component
                 });
 
                 // Show the popup menu at the mouse position
-                tabMenu.showMenuAsync(PopupMenu::Options().withMinimumWidth(150).withMaximumNumColumns(1));
+                auto position = e.getScreenPosition();
+                tabMenu.showMenuAsync(PopupMenu::Options().withMinimumWidth(150).withMaximumNumColumns(1).withTargetComponent(this).withTargetScreenArea(Rectangle<int>(position, position.translated(1, 1))));
             } else if (cnv && e.originalComponent == this) {
                 toFront(false);
                 parent->showTab(cnv, parent->tabbars[1].contains(this));