changed colors and display size

hsetlik · Jun 4, 2021 · cfd51f1 · cfd51f1
1 parent 46d74c4
commit cfd51f1
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 13 deletions.
diff --git a/Source/AlgorithmGraphComponent.h b/Source/AlgorithmGraphComponent.h
@@ -133,7 +133,7 @@ class AlgorithmGraph : public juce::Component, public juce::Timer
  }
  startTimerHz(24);
  pathColor = juce::Colours::black;
- background = UXPalette::darkGray1;
+ background = UXPalette::darkGray5;
  }
  float getValue(juce::String& str)
  {

diff --git a/Source/DAHDSRGraph.cpp b/Source/DAHDSRGraph.cpp
@@ -29,7 +29,7 @@ sRelease(Release)
  fDecay = 100.0f;
  fSustain = 0.6f;
  fRelease = 40.0f;
- bgColor = UXPalette::darkGray1;
+ bgColor = UXPalette::darkGray5;
  traceColor = UXPalette::highlight;
  startTimerHz(24);
 }

diff --git a/Source/GlobalColor.h b/Source/GlobalColor.h
@@ -16,6 +16,7 @@ static juce::Colour darkGray2 = Color::RGBColor(50, 80, 90);
 static juce::Colour lightGray = Color::RGBColor(125, 126, 129);
 static juce::Colour darkGray3 = lightGray.darker(0.7f);
 static juce::Colour darkGray4 = lightGray.darker(0.9f);
+static juce::Colour darkGray5 = darkGray4.darker(0.3f);
 static juce::Colour lightRed = Color::RGBColor(226, 76, 85);
 static juce::Colour darkRed = lightRed.darker(0.45f);
 static juce::Colour lightOrange = Color::RGBColor(249, 171, 62);

diff --git a/Source/LfoComponent.cpp b/Source/LfoComponent.cpp
@@ -90,8 +90,13 @@ LfoComponent::LfoComponent(int index) : lfoIndex(index), selector(index)
  levelSlider.setTextBoxStyle(juce::Slider::TextBoxBelow, false, 45, 15);
  levelSlider.setLookAndFeel(&look);
 
+ int colorId = juce::ComboBox::ColourIds::backgroundColourId;
+ getLookAndFeel().setColour(colorId, UXPalette::darkGray4);
+ waveSelector.setLookAndFeel(&getLookAndFeel());
+ targetSelector.setLookAndFeel(&getLookAndFeel());
  addAndMakeVisible(&waveSelector);
  addAndMakeVisible(&targetSelector);
+
  addAndMakeVisible(&selector);
  selector.setVisible(false);
  selector.setEnabled(false);

diff --git a/Source/LfoComponent.h b/Source/LfoComponent.h
@@ -45,8 +45,6 @@ class LfoModeSelector : public juce::Component, juce::Button::Listener
  std::unique_ptr<juce::AudioProcessorValueTreeState::ComboBoxAttachment> modeAttach;
 };
 
-
-
 class LfoComponent : public juce::Component, juce::ComboBox::Listener
 {
 public:
@@ -56,6 +54,8 @@ class LfoComponent : public juce::Component, juce::ComboBox::Listener
  {
  rateSlider.setLookAndFeel(nullptr);
  levelSlider.setLookAndFeel(nullptr);
+ waveSelector.setLookAndFeel(nullptr);
+ targetSelector.setLookAndFeel(nullptr);
  }
  void attachAll(juce::AudioProcessorValueTreeState* tree);
  void comboBoxChanged(juce::ComboBox* c) override;

diff --git a/Source/LfoProcessor.h b/Source/LfoProcessor.h
@@ -46,7 +46,7 @@ const int totalLfos = 4;
 class LfoProcessor
 {
 public:
- juce::AudioProcessorValueTreeState* tree;
+ juce::AudioProcessorValueTreeState* const tree;
  //functions
  LfoProcessor(int index, juce::AudioProcessorValueTreeState* t);
  ~LfoProcessor() {}

diff --git a/Source/ModulationGrid.cpp b/Source/ModulationGrid.cpp
@@ -71,8 +71,7 @@ void ModulationGrid::resized()
 
 void ModulationGrid::paint(juce::Graphics &g)
 {
- auto background = Color::RGBColor(37, 50, 53);
- g.fillAll(background);
+ g.fillAll(UXPalette::darkGray5);
  auto textColor = juce::Colours::white;
  g.setColour(textColor);
  g.setFont(UXPalette::futuraMediumItalic(12.0f));

diff --git a/Source/PatchManagerComponent.h b/Source/PatchManagerComponent.h
@@ -20,6 +20,12 @@ class PatchSelector : public juce::ComboBox
  {
  initialize();
  lastPatchNames = patchNames;
+ int colorId = juce::ComboBox::ColourIds::backgroundColourId;
+ getLookAndFeel().setColour(colorId, UXPalette::darkGray4);
+ colorId = juce::TextButton::ColourIds::buttonColourId;
+ getLookAndFeel().setColour(colorId, UXPalette::darkGray4);
+ colorId = juce::PopupMenu::ColourIds::backgroundColourId;
+ getLookAndFeel().setColour(colorId, UXPalette::darkGray4);
  }
  ~PatchSelector(){}
  void initialize();
@@ -54,6 +60,10 @@ class PatchLoader : public juce::Component, juce::Button::Listener, juce::ComboB
  PatchLoader(HexFmAudioProcessor* proc, juce::Component* patchDlg);
  ~PatchLoader() {}
  void resized() override;
+ void paint(juce::Graphics& g) override
+ {
+ g.fillAll(UXPalette::darkGray5);
+ }
  void savePreset(juce::String name, juce::String type);
  void loadPreset(juce::String name);
  void comboBoxChanged(juce::ComboBox* box) override;

diff --git a/Source/PatchSavingDialogBox.cpp b/Source/PatchSavingDialogBox.cpp
@@ -40,7 +40,7 @@ void PatchDialogBox::paint(juce::Graphics &g)
  g.fillAll(UXPalette::nearBlack);
  auto cushion = getHeight() / 14.0f;
  auto lightArea = getLocalBounds().toFloat().reduced(cushion);
- g.setColour(UXPalette::darkGray1);
+ g.setColour(UXPalette::darkGray3);
  g.fillRect(lightArea);
  auto labelFont = UXPalette::square(12.0f);
  g.setFont(labelFont);

diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
@@ -38,7 +38,7 @@ audioProcessor(p)
  modGrid.attachButtons(&audioProcessor.tree);
  addAndMakeVisible(&lfoGroup);
  lfoGroup.attachChildren(&audioProcessor.tree);
- setSize (1000, 800);
+ setSize (1200, 960);
 }
 
 HexFmAudioProcessorEditor::~HexFmAudioProcessorEditor()
@@ -47,12 +47,11 @@ HexFmAudioProcessorEditor::~HexFmAudioProcessorEditor()
 //==============================================================================
 void HexFmAudioProcessorEditor::paint(juce::Graphics &g)
 {
- auto background = Color::RGBColor(37, 50, 53);
- g.fillAll(background);
+ g.fillAll(UXPalette::darkGray5);
  for(int i = 0; i < 6; ++i)
  {
  auto rect = allOps[i]->getBounds();
- g.setColour(UXPalette::darkGray1);
+ g.setColour(UXPalette::darkGray5);
  g.fillRect(rect);
  auto centerRect = rect.reduced(2);
  g.setColour(UXPalette::darkGray3);
@@ -71,7 +70,7 @@ void HexFmAudioProcessorEditor::resized()
  //w = 250
  int h = getHeight() / 6;
  saveDialog.setBounds(w, 2 * h, 2 * w, 2 * h);
- //Screen dimensions are set to: 1000, 800
+ //Screen dimensions are set to: 1200, 960
  //overall aspect: 5/4
  dY = getHeight() / 10;
  allOps[0]->setBounds(0, dY, 3 * dY, 4.5 * dY);