Merge pull request #108 from sudara/refx/more_properties

Add button properties

Author: sudara

melatonin/component_model.h

@@ -24,6 +24,8 @@ namespace melatonin
         juce::Value pickedColor;
         juce::Value timing1, timing2, timing3, timingMax, hasChildren;
 
+        juce::Value isToggleable, toggleState, clickTogglesState, radioGroupId;
+
         struct AccessiblityDetail
         {
             juce::Value title, value, role, handlerType;
@@ -140,6 +142,14 @@ namespace melatonin
             typeValue = type (*selectedComponent);
             accessibilityHandledValue = selectedComponent->isAccessible();
 
+            if (auto button = dynamic_cast<juce::Button*> (selectedComponent.getComponent()))
+            {
+                isToggleable = button->isToggleable();
+                toggleState = button->getToggleState();
+                clickTogglesState = button->getClickingTogglesState();
+                radioGroupId = button->getRadioGroupId();
+            }
+
             nameValue.addListener(this);
             widthValue.addListener (this);
             heightValue.addListener (this);
@@ -154,6 +164,11 @@ namespace melatonin
             interceptsMouseValue.addListener (this);
             childrenInterceptsMouseValue.addListener (this);
 
+            isToggleable.addListener (this);
+            toggleState.addListener (this);
+            clickTogglesState.addListener (this);
+            radioGroupId.addListener (this);
+
             if (selectedComponent->isAccessible() && selectedComponent->getAccessibilityHandler())
             {
                 auto* accH = selectedComponent->getAccessibilityHandler();
@@ -260,6 +275,11 @@ namespace melatonin
             interceptsMouseValue.removeListener (this);
             childrenInterceptsMouseValue.removeListener (this);
 
+            isToggleable.removeListener (this);
+            toggleState.removeListener (this);
+            clickTogglesState.removeListener (this);
+            radioGroupId.removeListener (this);
+
             for (auto& np : namedProperties)
                 np.value.removeListener (this);
 
@@ -321,6 +341,26 @@ namespace melatonin
                 {
                     selectedComponent->setInterceptsMouseClicks (interceptsMouseValue.getValue(), childrenInterceptsMouseValue.getValue());
                 }
+                else if (value.refersToSameSourceAs (isToggleable))
+                {
+                    if (auto button = dynamic_cast<juce::Button*> (selectedComponent.getComponent()))
+                        button->setToggleable (isToggleable.getValue());
+                }
+                else if (value.refersToSameSourceAs (toggleState))
+                {
+                    if (auto button = dynamic_cast<juce::Button*> (selectedComponent.getComponent()))
+                        button->setToggleState (toggleState.getValue(), juce::dontSendNotification);
+                }
+                else if (value.refersToSameSourceAs (clickTogglesState))
+                {
+                    if (auto button = dynamic_cast<juce::Button*> (selectedComponent.getComponent()))
+                        button->setClickingTogglesState (clickTogglesState.getValue());
+                }
+                else if (value.refersToSameSourceAs (radioGroupId))
+                {
+                    if (auto button = dynamic_cast<juce::Button*> (selectedComponent.getComponent()))
+                        button->setRadioGroupId (radioGroupId.getValue());
+                }
                 else
                 {
                     for (auto& nv : namedProperties)

melatonin/components/properties.h

@@ -105,6 +105,16 @@ namespace melatonin
                 }
             }
 
+            // add class specific properies
+            if (dynamic_cast<juce::Button*> (model.getSelectedComponent()))
+            {
+                props.addArray (juce::Array<juce::PropertyComponent*> {
+                    new juce::BooleanPropertyComponent (model.isToggleable, "Is Toggleable", ""),
+                    new juce::BooleanPropertyComponent (model.toggleState, "Toggle State", ""),
+                    new juce::BooleanPropertyComponent (model.clickTogglesState, "Clicking Toggles State", ""),
+                    new juce::TextPropertyComponent (model.radioGroupId, "Radio Group ID", 5, false) });
+            }
+
             // then the rest of the component flags
             props.addArray (juce::Array<juce::PropertyComponent*> {
                 new juce::TextPropertyComponent (model.lookAndFeelValue, "LookAndFeel", 200, false, false),