Simplify and improve mechanism for recalling last plugin mode scale

Author: timothyschoen

Source/Pd/Patch.h

@@ -129,6 +129,7 @@ class Patch final : public ReferenceCountedObject {
     bool closePatchOnDelete;
 
     bool openInPluginMode = false;
+    int pluginModeScale = 100;
     int splitViewIndex = 0;
     int windowIndex = 0;
 

Source/PluginMode.h

@@ -91,14 +91,15 @@ class PluginMode final : public Component
         scaleComboBox.setColour(ComboBox::backgroundColourId, findColour(PlugDataColour::toolbarHoverColourId).withAlpha(0.8f));
         scaleComboBox.onChange = [this] {
             auto const itemId = scaleComboBox.getSelectedId();
+            if (itemId == 0) return;
             if (itemId == 8) {
                 setKioskMode(true);
                 return;
             }
             if (selectedItemId != itemId) {
                 selectedItemId = itemId;
                 setWidthAndHeight(pluginScales[itemId - 1].floatScale);
-                pluginPreviousScale = pluginScales[itemId - 1].intScale;
+                patchPtr->pluginModeScale = pluginScales[itemId - 1].intScale;
             }
         };
 
@@ -112,8 +113,6 @@ class PluginMode final : public Component
 
     ~PluginMode() override
     {
-        pluginModeScaleMap[patchPtr->getPointer().get()] = pluginPreviousScale;
-
         if (pluginModeLnf) {
             editor->setLookAndFeel(editor->pd->lnf);
             editor->pd->lnf->setTheme(SettingsFile::getInstance()->getTheme(lastTheme));
@@ -131,15 +130,9 @@ class PluginMode final : public Component
         return;
 #endif
         // set scale to the last scale that was set for this patches plugin mode
-        // if none was set, use 100% scale
-        if (pluginModeScaleMap.contains(patchPtr->getPointer().get())) {
-            int const previousScale = pluginModeScaleMap[patchPtr->getPointer().get()];
-            scaleComboBox.setText(String(previousScale) + String("%"), dontSendNotification);
-            setWidthAndHeight(previousScale * 0.01f);
-        } else {
-            scaleComboBox.setText(String(static_cast<int>(editor->pd->pluginModeScale * 100)) + String("%"), dontSendNotification);
-            setWidthAndHeight(editor->pd->pluginModeScale);
-        }
+        int const previousScale = patchPtr->pluginModeScale;
+        scaleComboBox.setText(String(previousScale) + String("%"), dontSendNotification);
+        setWidthAndHeight(previousScale * 0.01f);
     }
 
     void setWidthAndHeight(float const scale)
@@ -186,11 +179,11 @@ class PluginMode final : public Component
             }
         });
     }
-
+        
     void render(NVGcontext* nvg, Rectangle<int> area)
     {
         NVGScopedState scopedState(nvg);
-        float scale = editor->pd->pluginModeScale;
+        auto const scale = pluginModeScale;
 #if !JUCE_IOS
         if(isWindowFullscreen())
 #endif
@@ -207,6 +200,8 @@ class PluginMode final : public Component
 
     void closePluginMode()
     {
+        isClosing = true;
+        
         auto const constrainedNewBounds = windowBounds.withWidth(std::max(windowBounds.getWidth(), 890)).withHeight(std::max(windowBounds.getHeight(), 650));
         if (auto* mainWindow = dynamic_cast<PlugDataWindow*>(editor->getTopLevelComponent())) {
             editor->constrainer.setSizeLimits(890, 650, 99000, 99000);
@@ -226,6 +221,7 @@ class PluginMode final : public Component
 
         cnv->patch.openInPluginMode = false;
         editor->getTabComponent().updateNow();
+        isClosing = false;
     }
 
     bool isWindowFullscreen() const
@@ -271,6 +267,8 @@ class PluginMode final : public Component
 
     void resized() override
     {
+        if(isClosing) return;
+        
         // Detect if the user exited fullscreen with the macOS's fullscreen button
 #if JUCE_MAC
         if (ProjectInfo::isStandalone && isWindowFullscreen() && !desktopWindow->isFullScreen()) {
@@ -285,7 +283,7 @@ class PluginMode final : public Component
         float const scaleY = static_cast<float>(getHeight()) / height;
         float scale = jmin(scaleX, scaleY);
 
-        editor->pd->pluginModeScale = scale;
+        pluginModeScale = scale;
         scaleComboBox.setVisible(false);
         editorButton->setVisible(true);
 
@@ -318,7 +316,7 @@ class PluginMode final : public Component
             int const x = (getWidth() - scaledWidth) / 2;
             int const y = (getHeight() - scaledHeight) / 2;
 
-            editor->pd->pluginModeScale = scale;
+            pluginModeScale = scale;
 
             // Hide titlebar
             titleBar.setBounds(0, 0, 0, 0);
@@ -332,7 +330,7 @@ class PluginMode final : public Component
             cnv->setBounds(-b.getX() + x / scale, -b.getY() + y / scale, b.getWidth() + b.getX(), b.getHeight() + b.getY());
         } else {
             float scale = getWidth() / width;
-            editor->pd->pluginModeScale = scale;
+            pluginModeScale = scale;
             scaleComboBox.setVisible(true);
             editorButton->setVisible(true);
 
@@ -473,23 +471,22 @@ class PluginMode final : public Component
     int selectedItemId = 3; // default is 100% for now
 
     WindowDragger windowDragger;
-    bool isDraggingWindow = false;
-
-    bool isFullScreenKioskMode = false;
+    bool isDraggingWindow:1 = false;
+    bool isClosing:1 = false;
+    bool isFullScreenKioskMode:1 = false;
 
     Rectangle<int> originalPluginWindowBounds;
 
     Rectangle<int> windowBounds;
     float const width = static_cast<float>(cnv->patchWidth.getValue()) + 1.0f;
     float const height = static_cast<float>(cnv->patchHeight.getValue()) + 1.0f;
-    int pluginPreviousScale = 100;
+        
+    float pluginModeScale = 1.0f;
 
     String lastTheme;
 
     std::unique_ptr<PlugDataLook> pluginModeLnf;
 
-    static inline UnorderedMap<t_canvas*, int> pluginModeScaleMap;
-
     struct Scale {
         float floatScale;
         int intScale;

Source/PluginProcessor.cpp

@@ -1036,9 +1036,10 @@ void PluginProcessor::getStateInformation(MemoryBlock& destData)
         // Write new format
         patchTree->setAttribute("Content", content);
         patchTree->setAttribute("Location", patchFile);
-        patchTree->setAttribute("PluginMode", patch->openInPluginMode);
         patchTree->setAttribute("SplitIndex", patch->splitViewIndex);
-
+        patchTree->setAttribute("PluginMode", patch->openInPluginMode);
+        patchTree->setAttribute("PluginModeScale", patch->pluginModeScale);
+    
         patchesTree->addChildElement(patchTree);
     }
     unlockAudioThread();
@@ -1056,8 +1057,7 @@ void PluginProcessor::getStateInformation(MemoryBlock& destData)
     xml.setAttribute("Latency", getLatencySamples() - Instance::getBlockSize());
     xml.setAttribute("TailLength", getValue<float>(tailLength));
     xml.setAttribute("Legacy", false);
-    xml.setAttribute("PluginScale", pluginModeScale);
-    
+
     // TODO: make multi-window friendly
     if (auto const* editor = getActiveEditor()) {
         xml.setAttribute("Width", editor->getWidth());
@@ -1143,7 +1143,7 @@ void PluginProcessor::setStateInformation(void const* data, int const sizeInByte
 
     std::unique_ptr<XmlElement> const xmlState(getXmlFromBinary(xmlData, xmlSize));
 
-    auto openPatch = [this](String const& content, File const& location, bool const pluginMode = false, int const splitIndex = 0) {
+    auto openPatch = [this](String const& content, File const& location, bool const pluginMode = false, int pluginModeScale = 100, int const splitIndex = 0) {
         // CHANGED IN v0.9.0:
         // We now prefer loading the patch content over the patch file, if possible
         if (content.isNotEmpty()) {
@@ -1157,6 +1157,7 @@ void PluginProcessor::setStateInformation(void const* data, int const sizeInByte
             auto const patchPtr = loadPatch(content);
             patchPtr->splitViewIndex = splitIndex;
             patchPtr->openInPluginMode = pluginMode;
+            patchPtr->pluginModeScale = pluginModeScale;
             if (!locationIsValid || location.getParentDirectory() == File::getSpecialLocation(File::tempDirectory)) {
                 patchPtr->setUntitled();
             } else {
@@ -1167,6 +1168,7 @@ void PluginProcessor::setStateInformation(void const* data, int const sizeInByte
             auto const patchPtr = loadPatch(URL(location));
             patchPtr->splitViewIndex = splitIndex;
             patchPtr->openInPluginMode = pluginMode;
+            patchPtr->pluginModeScale = pluginModeScale;
         }
     };
 
@@ -1177,6 +1179,7 @@ void PluginProcessor::setStateInformation(void const* data, int const sizeInByte
                 auto content = p->getStringAttribute("Content");
                 auto location = p->getStringAttribute("Location");
                 auto const pluginMode = p->getBoolAttribute("PluginMode");
+                auto const pluginModeScale = p->getIntAttribute("PluginModeScale", 100);
 
                 int splitIndex = 0;
                 if (p->hasAttribute("SplitIndex")) {
@@ -1189,7 +1192,8 @@ void PluginProcessor::setStateInformation(void const* data, int const sizeInByte
                 auto patchesDir = ProjectInfo::appDataDir.getChildFile("Patches");
                 location = location.replace("${PATCHES_DIR}", patchesDir.getFullPathName());
 
-                openPatch(content, location, pluginMode, splitIndex);
+                openPatch(content, location, pluginMode, pluginModeScale, splitIndex);
+                
             }
         }
         // Otherwise, load from legacy format
@@ -1214,12 +1218,6 @@ void PluginProcessor::setStateInformation(void const* data, int const sizeInByte
             setOversampling(xmlState->getDoubleAttribute("Oversampling"));
             setLatencySamples(xmlState->getDoubleAttribute("Latency") + Instance::getBlockSize());
             tailLength = xmlState->getDoubleAttribute("TailLength");
-#if !JUCE_IOS
-            if(!ProjectInfo::isStandalone && xmlState->hasAttribute("PluginScale"))
-            {
-                pluginModeScale = std::clamp(xmlState->getDoubleAttribute("PluginScale"), 0.5, 2.0);
-            }
-#endif
         }
 
         if (xmlState->hasAttribute("Version")) {