MOre accessibility

- Everything is labeled - Buttons have return bound action
baconpaul · Jan 5, 2025 · 8fce738 · 8fce738
1 parent 7ce62cb
commit 8fce738
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/libs/sst/sst-jucegui b/libs/sst/sst-jucegui
diff --git a/src/ui/dahdsr-components.h b/src/ui/dahdsr-components.h
@@ -134,23 +134,28 @@ template <typename Comp, typename PatchPart> struct DAHDSRComponents
         auto osv = (int)std::round(patchPartPtr->envIsOneShot.value);
 
         std::string LE = (osv ? u8"\U000000B9" : "");
+        std::string LEacc = (osv ? " (one shot)" : "");
+        std::string nm = "";
+        if (patchPartPtr)
+            nm = patchPartPtr->name();
 
         switch (tmv)
         {
         case (int)TriggerMode::NEW_GATE:
-            triggerButton->setLabel("L" + LE);
+            triggerButton->setLabelAndTitle("L" + LE, nm + " Env Trigger Legato" + LEacc);
             break;
         case (int)TriggerMode::NEW_VOICE:
-            triggerButton->setLabel("S" + LE);
+            triggerButton->setLabelAndTitle("S" + LE, nm + " Env Trigger on Voice" + LEacc);
             break;
         case (int)TriggerMode::KEY_PRESS:
-            triggerButton->setLabel("K" + LE);
+            triggerButton->setLabelAndTitle("K" + LE, nm + " Env Trigger on Key" + LEacc);
             break;
         case (int)TriggerMode::ON_RELEASE:
-            triggerButton->setLabel("R"); // one shot does nothing with release
+            triggerButton->setLabelAndTitle("R", nm + " Env Trigger on Release" +
+                                                     LEacc); // one shot does nothing with release
             break;
         case (int)TriggerMode::PATCH_DEFAULT:
-            triggerButton->setLabel("D" + LE);
+            triggerButton->setLabelAndTitle("D" + LE, nm + " Env Patch Default Trigger" + LEacc);
             break;
         }
         triggerButton->repaint();

diff --git a/src/ui/modulation-components.h b/src/ui/modulation-components.h
@@ -91,12 +91,14 @@ template <typename Comp, typename Patch> struct ModulationComponents
             sourceMenu[i]->setLabel("");
             return;
         }
+        auto n = patchPtr->name();
         auto v = (uint32_t)std::round(patchPtr->modsource[i].value);
 
         auto p = asComp()->editor.modMatrixConfig.sourceByID.find(v);
         if (p != asComp()->editor.modMatrixConfig.sourceByID.end())
         {
-            sourceMenu[i]->setLabel(p->second.name);
+            sourceMenu[i]->setLabelAndTitle(
+                p->second.name, n + " Mod Source " + std::to_string(i + 1) + " " + p->second.name);
         }
         else
         {
@@ -113,14 +115,16 @@ template <typename Comp, typename Patch> struct ModulationComponents
         }
         std::string res{"ERR"};
         auto v = (uint32_t)std::round(patchPtr->modtarget[i].value);
+        auto n = patchPtr->name();
         for (auto &[id, nm] : patchPtr->targetList)
         {
             if (id == v)
             {
                 res = nm;
             }
         }
-        targetMenu[i]->setLabel(res);
+        targetMenu[i]->setLabelAndTitle(res,
+                                        n + " Mod Target " + std::to_string(i + 1) + " " + res);
     }
 
     void layoutModulation(const juce::Rectangle<int> &r)

diff --git a/src/ui/playmode-sub-panel.cpp b/src/ui/playmode-sub-panel.cpp
@@ -135,14 +135,16 @@ PlayModeSubPanel::PlayModeSubPanel(SixSinesEditor &e) : HasEditor(e)
     voiceLimitL->setText("Voices");
     addAndMakeVisible(*voiceLimitL);
     voiceLimit = std::make_unique<jcmp::MenuButton>();
-    voiceLimit->setLabel(std::to_string(getPolyLimit()));
+    voiceLimit->setLabelAndTitle(std::to_string(getPolyLimit()),
+                                 "Voice Limit " + std::to_string(getPolyLimit()));
     voiceLimit->setOnCallback([this]() { showPolyLimitMenu(); });
     editor.componentRefreshByID[editor.patchCopy.output.polyLimit.meta.id] =
         [w = juce::Component::SafePointer(this)]()
     {
         if (!w)
             return;
-        w->voiceLimit->setLabel(std::to_string(w->getPolyLimit()));
+        w->voiceLimit->setLabelAndTitle(std::to_string(w->getPolyLimit()),
+                                        "Voice Limit " + std::to_string(w->getPolyLimit()));
     };
     addAndMakeVisible(*voiceLimit);
 
@@ -352,7 +354,8 @@ void PlayModeSubPanel::setPolyLimit(int plVal)
     editor.uiToAudio.push({Synth::UIToAudioMsg::Action::SET_PARAM, pl.meta.id, (float)plVal});
     editor.flushOperator();
 
-    voiceLimit->setLabel(std::to_string(getPolyLimit()));
+    voiceLimit->setLabelAndTitle(std::to_string(getPolyLimit()),
+                                 "Voice Limit " + std::to_string(getPolyLimit()));
     voiceLimit->repaint();
 }
 

diff --git a/src/ui/six-sines-editor.cpp b/src/ui/six-sines-editor.cpp
@@ -431,6 +431,8 @@ struct MenuValueTypein : HasEditor, juce::PopupMenu::CustomComponent, juce::Text
     {
         if (underComp && underComp->continuous())
         {
+            underComp->onBeginEdit();
+
             if (s.empty())
             {
                 underComp->continuous()->setValueFromGUI(
@@ -440,7 +442,10 @@ struct MenuValueTypein : HasEditor, juce::PopupMenu::CustomComponent, juce::Text
             {
                 underComp->continuous()->setValueAsString(s);
             }
+            underComp->onEndEdit();
+            underComp->repaint();
             underComp->grabKeyboardFocus();
+            underComp->notifyAccessibleChange();
         }
     }