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 33331dc..7d7bf60 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/DXLookNFeel.cpp b/Source/DXLookNFeel.cpp
index e14aa42..f6d8eb5 100644
--- a/Source/DXLookNFeel.cpp
+++ b/Source/DXLookNFeel.cpp
@@ -146,24 +146,24 @@ void AlgoDisplay::paint(Graphics &g) {
String algoTxt;
algoTxt << (alg+1);
- g.drawText(algoTxt, 0, 0, 21, 14, Justification::left, true);
+ g.drawText(algoTxt, 5, 1, 21, 14, Justification::left, true);
}
void AlgoDisplay::drawOp(Graphics &g, int x, int y, int num, bool feedback) {
String txt;
txt << num;
- int offx = 25;
- int offy = 18;
+ int offx = 24;
+ int offy = 17;
g.setColour(Colour(0xFF0FC00F));
- g.fillRect(x*offx+1, y*offy+1, offx-2, offy-1);
+ g.fillRect(x*offx+4, y*offy+3, offx-2, offy-1);
g.setColour(Colour(0xFFFFFFFF));
- g.drawText(txt, x*offx, y*offy, offx, offy, Justification::centred, true);
+ g.drawText(txt, x*offx+3, y*offy+2, offx+2, offy+2, Justification::centred, true);
if ( feedback ) {
g.setColour(Colour(0xFFFFFFFF));
- int x1 = (x*offx) + 23;
- g.drawLine(x1, y*offy+1, x1, y*offy+offy, 3);
+ int x1 = (x*offx) + 24;
+ g.drawLine(x1+1, y*offy+3, x1+1, y*offy+offy+2, 3);
}
}
diff --git a/Source/DXLookNFeel.h b/Source/DXLookNFeel.h
index 5352f35..b453fad 100644
--- a/Source/DXLookNFeel.h
+++ b/Source/DXLookNFeel.h
@@ -33,6 +33,14 @@ public:
void paint(Graphics &g);
};
+class PitchEnvDisplay : public Component {
+ Env env;
+public:
+ char *pvalues;
+
+ void paint(Graphics &g);
+};
+
class AlgoDisplay : public Component {
void drawOp(Graphics &g, int x, int y, int num, bool feedback);
@@ -44,10 +52,7 @@ public:
};
class DXLookNFeel : public LookAndFeel_V3 {
-
public:
- const Colour white;
-
DXLookNFeel();
};
diff --git a/Source/GlobalEditor.cpp b/Source/GlobalEditor.cpp
index 356ed89..dbc5e69 100644
--- a/Source/GlobalEditor.cpp
+++ b/Source/GlobalEditor.cpp
@@ -240,7 +240,7 @@ void GlobalEditor::resized()
lfoDelay->setBounds (672, 64, 24, 24);
cutoff->setBounds (8, 40, 48, 48);
reso->setBounds (64, 40, 48, 48);
- algoDisplay->setBounds (416, 8, 150, 72);
+ algoDisplay->setBounds (408, 8, 152, 74);
pitchRate2->setBounds (776, 64, 32, 24);
pitchRate3->setBounds (800, 64, 32, 24);
pitchRate4->setBounds (824, 64, 32, 24);
@@ -465,7 +465,7 @@ BEGIN_JUCER_METADATA
style="Rotary" textBoxPos="NoTextBox" textBoxEditable="1" textBoxWidth="80"
textBoxHeight="20" skewFactor="1"/>