diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp index 3cd29d9..61a5377 100644 --- a/Source/PluginEditor.cpp +++ b/Source/PluginEditor.cpp @@ -759,11 +759,11 @@ void MainContentComponent::paint(juce::Graphics& g) { drawSection(10, 128, 498, 200); drawSection(520, 128, 620, 200); drawSection(1152, 128, 498, 200); - drawSection(75, 338, 498, 150); - drawSection(585, 338, 498, 150); - drawSection(1095, 338, 490, 150); - drawSection(10, 900, 1640, 128); - drawSection(10, 1038, 1640, 136); + drawSection(75, 338, 498, 160); + drawSection(585, 338, 498, 160); + drawSection(1095, 338, 490, 160); + drawSection(10, 818, 1640, 128); + drawSection(10, 956, 1640, 136); // FX sub-sections auto drawSubSection = [&](int x, int y, int w, int h, const juce::String& title, int titlePadY = 2) { @@ -780,17 +780,17 @@ void MainContentComponent::paint(juce::Graphics& g) { g.drawText(title, x + 6, y + titlePadY, w - 12, 14, juce::Justification::centred); }; - drawSubSection(15, 524, 395, 140, "DISTORTION", 6); - drawSubSection(420, 524, 660, 140, "COMPRESSOR", 6); - drawSubSection(1090, 524, 240, 140, "AUTO-PAN", 6); + drawSubSection(15, 508, 395, 140, "DISTORTION", 6); + drawSubSection(420, 508, 660, 140, "COMPRESSOR", 6); + drawSubSection(1090, 508, 240, 140, "AUTO-PAN", 6); // LFO sub-sections - drawSubSection(15, 690, 530, 150, "LFO 1", 4); - drawSubSection(560, 690, 530, 150, "LFO 2", 4); + drawSubSection(15, 658, 530, 150, "LFO 1", 4); + drawSubSection(560, 658, 530, 150, "LFO 2", 4); // FX2 sub-sections - drawSubSection(1100, 690, 265, 200, "DELAY", 4); - drawSubSection(1375, 690, 265, 200, "REVERB", 4); + drawSubSection(1100, 658, 265, 150, "DELAY", 4); + drawSubSection(1375, 658, 265, 150, "REVERB", 4); } void MainContentComponent::resized() { @@ -847,7 +847,7 @@ void MainContentComponent::resized() { pbRangeKnob.setBounds(1105 + (knobSize + knobSpacing) * 3, knobYM, knobSize, knobSize); // --- FX SECTION --- - int fxY = 496; + int fxY = 480; int fxKnobSize = 100; int fxLabelH = 16; int fxKnobY = fxY + 54; // sub-section y(476) + titlePad(6) + titleH(14) + bottomPad(6) + 4 @@ -872,9 +872,9 @@ void MainContentComponent::resized() { autoPanDepthKnob.setBounds(1098 + fxKnobSize + 8, fxKnobY, fxKnobSize, fxKnobSize); // --- LFO SECTION --- - int lfoY = 670; + int lfoY = 638; int lfoKnobSize = 80; - int lfoKnobY = 690 + 4 + 14 + 6; // subSectionY + titlePad + titleH + bottomPad + int lfoKnobY = 658 + 4 + 14 + 6; // subSectionY + titlePad + titleH + bottomPad lfoLabel.setBounds(10, lfoY, 1080, fxLabelH); fx2Label.setBounds(1100, lfoY, 540, fxLabelH); @@ -922,14 +922,14 @@ void MainContentComponent::resized() { uiScaleBox.setBounds(1566, 8, 80, 24); // Visualizer area - int vizY = 900; + int vizY = 818; int vizH = 128; vuMeter.setBounds(14, vizY, 40, vizH); waveformDisplay.setBounds(60, vizY, 780, vizH); spectrumAnalyzer.setBounds(850, vizY, 794, vizH); // Piano roll - pianoRoll.setBounds(10, 1038, 1640, 136); + pianoRoll.setBounds(10, 956, 1640, 136); } // ===== PianoRollComponent ===== diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h index b3a5070..4330259 100644 --- a/Source/PluginEditor.h +++ b/Source/PluginEditor.h @@ -218,7 +218,7 @@ private: MainContentComponent content; float currentScale = 1.0f; static constexpr int baseWidth = 1660; - static constexpr int baseHeight = 1182; + static constexpr int baseHeight = 1100; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ChromaFlockEditor) };