Fixed a crash when undoing after a drag operation

ffAudio · Sep 13, 2021 · 7c28c5d · 7c28c5d
1 parent 6b3d657
commit 7c28c5d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/Editor/foleys_StyleBoolPropertyComponent.cpp b/Editor/foleys_StyleBoolPropertyComponent.cpp
@@ -68,9 +68,14 @@ void StyleBoolPropertyComponent::refresh()
     if (auto* toggle = dynamic_cast<juce::ToggleButton*>(editor.get()))
     {
         if (node == inheritedFrom)
+        {
             toggle->getToggleStateValue().referTo (node.getPropertyAsValue (property, &builder.getUndoManager()));
+        }
         else
+        {
+            toggle->getToggleStateValue().referTo (toggle->getToggleStateValue());
             toggle->setToggleState (value, juce::dontSendNotification);
+        }
     }
 
     repaint();

diff --git a/Editor/foleys_StyleChoicePropertyComponent.cpp b/Editor/foleys_StyleChoicePropertyComponent.cpp
@@ -97,9 +97,14 @@ void StyleChoicePropertyComponent::refresh()
     if (auto* combo = dynamic_cast<juce::ComboBox*>(editor.get()))
     {
         if (node == inheritedFrom)
+        {
             proxy.referTo (node.getPropertyAsValue (property, &builder.getUndoManager()));
+        }
         else
+        {
+            proxy.referTo (proxy);
             combo->setText (value.toString(), juce::dontSendNotification);
+        }
     }
 
     repaint();

diff --git a/Editor/foleys_StyleColourPropertyComponent.cpp b/Editor/foleys_StyleColourPropertyComponent.cpp
@@ -133,6 +133,7 @@ void StyleColourPropertyComponent::refresh()
             if (value.isVoid())
                 getLookAndFeelColourFallback();
 
+            label->getTextValue().referTo (label->getTextValue());
             label->setText (value.toString(), juce::dontSendNotification);
         }
     }

diff --git a/Editor/foleys_StyleGradientPropertyComponent.cpp b/Editor/foleys_StyleGradientPropertyComponent.cpp
@@ -97,6 +97,7 @@ void StyleGradientPropertyComponent::refresh()
         }
         else
         {
+            label->getTextValue().referTo (label->getTextValue());
             label->setText (value.toString(), juce::dontSendNotification);
         }
     }

diff --git a/Editor/foleys_StyleTextPropertyComponent.cpp b/Editor/foleys_StyleTextPropertyComponent.cpp
@@ -68,9 +68,14 @@ void StyleTextPropertyComponent::refresh()
     if (auto* label = dynamic_cast<juce::Label*>(editor.get()))
     {
         if (node == inheritedFrom)
+        {
             label->getTextValue().referTo (node.getPropertyAsValue (property, &builder.getUndoManager()));
+        }
         else
+        {
+            label->getTextValue().referTo (label->getTextValue());
             label->setText (value.toString(), juce::dontSendNotification);
+        }
     }
 
     repaint();

diff --git a/VERSION.md b/VERSION.md
@@ -4,7 +4,9 @@ PluginGuiMagic - Versions history
 1.3.5
 -----
 
+- Fixed AlertWindow::IconType to a backward compatible version
 - Add ParameterAttachment for Label
+- Added a fix when undo after a edit-drag operation
 
 1.3.4 - 01.08.2021
 ------------------

diff --git a/foleys_gui_magic.h b/foleys_gui_magic.h
@@ -37,7 +37,7 @@
 
     ID:            foleys_gui_magic
     vendor:        Foleys Finest Audio
-    version:       1.3.3
+    version:       1.3.5
     name:          Foleys GUI magic
     description:   This module allows to create GUI with a drag and drop editor
     dependencies:  juce_core, juce_audio_basics, juce_audio_devices, juce_audio_formats,
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,6 +97,7 @@ void StyleGradientPropertyComponent::refresh() @@
             }
             else
             {
+                label->getTextValue().referTo (label->getTextValue());
                 label->setText (value.toString(), juce::dontSendNotification);
             }
         }
@@ Expand Down @@