Fix incorrect painting of global FX bypasses (#4893)

* Fix incorrect painting of global FX bypasses Closes #4892 Also fixes color of send 3/4 sliders in Dark skin. * Small code review change Co-authored-by: Paul Walker <[email protected]>
surge-synthesizer · Aug 23, 2021 · 38bfe62 · 38bfe62
1 parent 870c65d
commit 38bfe62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/resources/data/skins/dark-mode.surge-skin/skin.xml b/resources/data/skins/dark-mode.surge-skin/skin.xml
@@ -232,6 +232,8 @@
     <control ui_identifier="scene.width" class="def-hslider"/>
     <control ui_identifier="scene.send_fx_1" class="def-hslider"/>
     <control ui_identifier="scene.send_fx_2" class="def-hslider"/>
+    <control ui_identifier="scene.send_fx_3" class="def-hslider"/>
+    <control ui_identifier="scene.send_fx_4" class="def-hslider"/>
 
     <control ui_identifier="scene.portamento" class="def-hslider"/>
     <control ui_identifier="scene.pitch" class="def-hslider"/>

diff --git a/src/gui/widgets/EffectChooser.h b/src/gui/widgets/EffectChooser.h
@@ -102,11 +102,13 @@ struct EffectChooser : public juce::Component, public WidgetBaseMixin<EffectChoo
         case fxb_no_fx:
             return true;
         case fxb_no_sends:
-            if ((fxslot == 4) || (fxslot == 5))
+            if ((fxslot == fxslot_send1) || (fxslot == fxslot_send2) || (fxslot == fxslot_send3) ||
+                (fxslot == fxslot_send4))
                 return true;
             break;
         case fxb_scene_fx_only:
-            if (fxslot > 3)
+            if ((fxslot >= fxslot_send1 && fxslot <= fxslot_global2) ||
+                (fxslot >= fxslot_send3 && fxslot <= fxslot_global4))
                 return true;
             break;
         }