diff --git a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate index c2e58df..81994d7 100644 Binary files a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate and b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Source/DXComponents.cpp b/Source/DXComponents.cpp index a277af3..7f52049 100644 --- a/Source/DXComponents.cpp +++ b/Source/DXComponents.cpp @@ -198,6 +198,7 @@ void EnvDisplay::paint(Graphics &g) { g.drawText(len, 5, 1, 72, 14, Justification::left, true); } + PitchEnvDisplay::PitchEnvDisplay() { pvalues = (char *) &TMP_LEVEL_PTR; vPos = 0; @@ -253,8 +254,6 @@ void PitchEnvDisplay::paint(Graphics &g) { if ( vPos == i ) { g.fillEllipse(oldx-2, oldy-2, 4, 4); } - - TRACE("pitch pos %d", vPos); } diff --git a/Source/DXLookNFeel.cpp b/Source/DXLookNFeel.cpp index 272f249..ad955a2 100644 --- a/Source/DXLookNFeel.cpp +++ b/Source/DXLookNFeel.cpp @@ -20,6 +20,9 @@ #include "DXLookNFeel.h" +Colour DXLookNFeel::dxDarkBrown = Colour(0xFF0FC00F); +Colour DXLookNFeel::dxLightBrown = Colour(0xFFA87B67); + DXLookNFeel::DXLookNFeel() { setColour(TextButton::buttonColourId,Colour(0xFF0FC00F)); setColour(Slider::rotarySliderOutlineColourId,Colour(0xFF0FC00F)); diff --git a/Source/DXLookNFeel.h b/Source/DXLookNFeel.h index fe295fc..bdc85eb 100644 --- a/Source/DXLookNFeel.h +++ b/Source/DXLookNFeel.h @@ -25,6 +25,9 @@ class DXLookNFeel : public LookAndFeel_V3 { public: + static Colour dxDarkBrown; + static Colour dxLightBrown; + DXLookNFeel(); }; diff --git a/Source/OperatorEditor.cpp b/Source/OperatorEditor.cpp index 7c98316..0cf1947 100644 --- a/Source/OperatorEditor.cpp +++ b/Source/OperatorEditor.cpp @@ -110,6 +110,7 @@ OperatorEditor::OperatorEditor () khzDisplay->setJustificationType (Justification::centred); khzDisplay->setEditable (false, false, false); khzDisplay->setColour (Label::backgroundColourId, Colour (0x6a000000)); + khzDisplay->setColour (Label::textColourId, Colours::white); khzDisplay->setColour (Label::outlineColourId, Colour (0x00000000)); khzDisplay->setColour (TextEditor::textColourId, Colours::black); khzDisplay->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); @@ -547,10 +548,10 @@ BEGIN_JUCER_METADATA style="Rotary" textBoxPos="NoTextBox" textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>