added Fonts to BinaryData

changed gimmick fonts

HexFm.jucer

@@ -6,6 +6,18 @@
  pluginCharacteristicsValue="pluginIsSynth,pluginWantsMidiIn">
  <MAINGROUP id="f8EfdE" name="HexFm">
  <GROUP id="{DC7DA288-18E4-8EA7-1D3D-9542BABB314D}" name="Source">
+ <GROUP id="{DDF0CD31-452F-A270-D101-9711F5544DF1}" name="Fonts">
+ <FILE id="GeYyUM" name="BebasNeue-Regular.otf" compile="0" resource="1"
+ file="Source/Fonts/BebasNeue-Regular.otf"/>
+ <FILE id="HfI4Rx" name="Futura Medium Italic.otf" compile="0" resource="1"
+ file="Source/Fonts/Futura Medium Italic.otf"/>
+ <FILE id="g2W55g" name="Roboto-Light.ttf" compile="0" resource="1"
+ file="Source/Fonts/Roboto-Light.ttf"/>
+ <FILE id="Rgix3F" name="Roboto-LightItalic.ttf" compile="0" resource="1"
+ file="Source/Fonts/Roboto-LightItalic.ttf"/>
+ <FILE id="raWgB9" name="Square.ttf" compile="0" resource="1" file="Source/Fonts/Square.ttf"/>
+ <FILE id="RPKn9q" name="Squareo.ttf" compile="0" resource="1" file="Source/Fonts/Squareo.ttf"/>
+ </GROUP>
  <GROUP id="{2C3B5696-203C-F91C-2504-0D9453629D94}" name="PNGs">
  <FILE id="yurrz7" name="bothOff.png" compile="0" resource="1" file="PNGs/bothOff.png"/>
  <FILE id="Zzs1UN" name="bothOn.png" compile="0" resource="1" file="PNGs/bothOn.png"/>

Source/AlgorithmGraphComponent.cpp

@@ -20,7 +20,7 @@ void OperatorBox::paint(juce::Graphics &g)
  g.setColour(fillColor);
  g.fillRect(filledBounds);
  g.setColour(textColor);
- g.setFont(juce::Font("VCR OSD Mono", AlgorithmGridConstants::opTextSize, 0)); //TODO: pick a better font
+ g.setFont(UXPalette::square(AlgorithmGridConstants::opTextSize)); //TODO: pick a better font
  auto textBounds = filledBounds.reduced(5.0f);
  auto idxString = juce::String(std::to_string(index + 1));
  g.drawText(idxString, textBounds, juce::Justification::centred);

Source/CustomLnF.cpp

@@ -81,7 +81,7 @@ void LnF1::drawButtonText(juce::Graphics &g, juce::TextButton &t, bool shouldDra
  auto fBounds = t.getLocalBounds().toFloat();
  auto delta = fBounds.getHeight() / 6.5f;
  fBounds = fBounds.reduced(delta);
- buttonFont = juce::Font(buttonFontName, 15.0f, 0);
+ buttonFont.setHeight(15.0f);
  g.setFont(buttonFont);
  g.setColour(juce::Colours::white);
  g.drawFittedText(t.getButtonText(), fBounds.toType<int>(), juce::Justification::centred, 1);

Source/CustomLnF.h

@@ -13,17 +13,16 @@
 class LnF1 : public juce::LookAndFeel_V4
 {
 public:
- LnF1() : buttonFontName("Bebas Neue")
+ LnF1()
  {
- setDefaultSansSerifTypefaceName("Bebas Neue");
+ buttonFont = UXPalette::bebasNeue(8.0f);
  }
  void drawRotarySlider (juce::Graphics& g, int x, int y, int width, int height, float sliderPos,
  const float rotaryStartAngle, const float rotaryEndAngle, juce::Slider& s) override;
  void drawLinearSlider(juce::Graphics &g, int x, int y, int width, int height, float sliderPos, float minSliderPos, float maxSliderPos, const juce::Slider::SliderStyle, juce::Slider &) override;
  void drawButtonBackground (juce::Graphics &, juce::Button &b, const juce::Colour &backgroundColour, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override;
  void drawButtonText(juce::Graphics& g, juce::TextButton& t, bool shouldDrawHighlighted, bool shouldDrawDown) override;
 private:
- juce::String buttonFontName;
  juce::Font buttonFont;
 };
 
@@ -42,7 +41,7 @@ class OutputButtonLnF : public juce::LookAndFeel_V4
 public:
  juce::Font getTextButtonFont(juce::TextButton &, int buttonHeight) override
  {
- return juce::Font("Bebas Neue", buttonHeight, 0);
+ return UXPalette::bebasNeue((float)buttonHeight);
  }
  void drawButtonBackground (juce::Graphics &g, juce::Button &b, const juce::Colour &backgroundColour, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override
  {
@@ -73,7 +72,7 @@ class TabbedButtonLnF : public juce::LookAndFeel_V4
  }
  juce::Font getTabButtonFont (juce::TabBarButton &, float height) override
  {
- return juce::Font("Bebas Neue", height, 0);
+ return UXPalette::bebasNeue(height);
  }
  void createTabButtonShape(juce::TabBarButton& b, juce::Path& path, bool isMouseOver, bool isMouseDown) override
  {

Source/GlobalColor.h

@@ -21,11 +21,54 @@ static juce::Colour darkRed = lightRed.darker(0.45f);
 static juce::Colour lightOrange = Color::RGBColor(249, 171, 62);
 static juce::Colour highlight = Color::RGBColor(255, 236, 95);
 static juce::Colour nearBlack = Color::RGBColor(24, 24, 25);
+/*
+static juce::String operatorLabelFontName = "SquareFont Outline";
+static juce::String modGridFontName = "Roboto Light";
+ */
+//==============================================================================
+//! to easily get fonts from BinaryData
+static juce::Font squareOutline(float height = 8.0f)
+{
+ auto typeface = juce::Typeface::createSystemTypefaceFor(BinaryData::Squareo_ttf, BinaryData::Squareo_ttfSize);
+ auto font = juce::Font(typeface);
+ font.setHeight(height);
+ return font;
+}
+static juce::Font square(float height = 8.0f)
+{
+ auto typeface = juce::Typeface::createSystemTypefaceFor(BinaryData::Square_ttf, BinaryData::Square_ttfSize);
+ auto font = juce::Font(typeface);
+ font.setHeight(height);
+ return font;
+}
+static juce::Font bebasNeue(float height = 8.0f)
+{
+ auto typeface = juce::Typeface::createSystemTypefaceFor(BinaryData::BebasNeueRegular_otf, BinaryData::BebasNeueRegular_otfSize);
+ auto font = juce::Font(typeface);
+ font.setHeight(height);
+ return font;
+}
 static juce::Font futuraMediumItalic(float size)
 {
- return juce::Font("Futura Medium", size, 0).withStyle(juce::Font::FontStyleFlags::italic);
+ auto typeface = juce::Typeface::createSystemTypefaceFor(BinaryData::Futura_Medium_Italic_otf, BinaryData::Futura_Medium_Italic_otfSize);
+ auto font = juce::Font(typeface);
+ font.setHeight(size);
+ return font;
 }
-static juce::String operatorLabelFontName = "SquareFont Outline";
-static juce::String modGridFontName = "Roboto Light";
+static juce::Font robotoLight(float size)
+{
+ auto typeface = juce::Typeface::createSystemTypefaceFor(BinaryData::RobotoLight_ttf, BinaryData::RobotoLight_ttfSize);
+ auto font = juce::Font(typeface);
+ font.setHeight(size);
+ return font;
+}
+static juce::Font robotoLightItalic(float size)
+{
+ auto typeface = juce::Typeface::createSystemTypefaceFor(BinaryData::RobotoLightItalic_ttf, BinaryData::RobotoLightItalic_ttfSize);
+ auto font = juce::Font(typeface);
+ font.setHeight(size);
+ return font;
+}
+
 };
 

Source/LfoComponent.cpp

@@ -170,7 +170,7 @@ void LfoComponent::paint(juce::Graphics &g)
  auto n = getWidth() / 24;
  auto lLabelBox = juce::Rectangle<int> {2 * n, int(0.5 * n), 5 * n, 2 * n};
  auto rLabelBox = juce::Rectangle<int> {2 * n, int(12 * n), 5 * n, 2 * n};
- g.setFont(juce::Font("VCR OSD Mono", 13.0f, 0));
+ g.setFont(UXPalette::square(13.0f));
  g.setColour(juce::Colours::white);
  g.drawText("Level", lLabelBox, juce::Justification::centredBottom);
  g.drawText("Rate", rLabelBox, juce::Justification::centredBottom);

Source/OperatorComponent.cpp

@@ -181,7 +181,7 @@ void OperatorComponent::paint(juce::Graphics &g)
  auto rLabelBox = juce::Rectangle<int>{int(11.5 * n), int(4.5 * n), 6 * n, 2 * n};
  auto lLabelBox = juce::Rectangle<int>{19 * n, 13 * n, 4 * n, 2 * n};
  auto pLabelBox = juce::Rectangle<int>{19 * n, int(4.5 * n), 4 * n, 2 * n};
- g.setFont(juce::Font(UXPalette::operatorLabelFontName, 25.0f, 0));
+ g.setFont(UXPalette::squareOutline(25.0f));
  g.setColour(juce::Colours::white);
  //g.fillRect(indexLabel.getBounds());
  auto nameRect = juce::Rectangle<int> {n , n * (11 / 10), 14 * n, 4 * n};
@@ -191,7 +191,7 @@ void OperatorComponent::paint(juce::Graphics &g)
  auto rText = "RATIO";
  auto lText = "LEVEL";
  auto pText = "PAN";
- g.setFont(juce::Font("Bebas Neue", 14.0f, 0));
+ g.setFont(UXPalette::bebasNeue(14.0f));
  g.drawText(iText, iLabelBox, juce::Justification::centredBottom);
  g.drawText(rText, rLabelBox, juce::Justification::centredBottom);
  g.drawText(lText, lLabelBox, juce::Justification::centredBottom);

Source/PatchSavingDialogBox.cpp

@@ -38,13 +38,13 @@ PatchDialogBox::PatchDialogBox(PatchLoader* loader) : patchLoader(loader)
 void PatchDialogBox::paint(juce::Graphics &g)
 {
  g.fillAll(UXPalette::darkGray2);
- auto labelFont = juce::Font("VCR OSD Mono", 12.0f, 0);
+ auto labelFont = UXPalette::square(12.0f);
  g.setFont(labelFont);
  g.setColour(juce::Colours::white);
  int w = getWidth() / 18;
  int h = getHeight() / 8;
  auto textBox = juce::Rectangle<int> {w, h, 8 * w, 2 * h};
- g.drawText("Patch Name:", textBox, juce::Justification::centred);
+ g.drawText("Patch Name:", textBox, juce::Justification::left);
 }
 
 

Source/SliderSubclasses.h

@@ -10,7 +10,7 @@ class EnvLabel : public juce::Label, public juce::Slider::Listener
 public:
  EnvLabel(juce::Slider* sliderToAttach, juce::String suff, float fontSize = 8.0f) : attachSlider(sliderToAttach), suffix(suff)
  {
- auto robotoLightItalic = juce::Font("Roboto Light", fontSize, 0).withStyle(juce::Font::FontStyleFlags::italic);
+ auto robotoLightItalic = UXPalette::robotoLightItalic(fontSize);
  setEditable(true);
  setFont(robotoLightItalic);
  attachSlider->addListener(this);
@@ -31,8 +31,7 @@ class EnvLabel : public juce::Label, public juce::Slider::Listener
  ~EnvLabel() {}
  void setFontSize(float size)
  {
- auto robotoLightItalic = juce::Font("Roboto Light", size, 0).withStyle(juce::Font::FontStyleFlags::italic);
- setFont(robotoLightItalic);
+ setFont(UXPalette::robotoLightItalic(size));
  }
  void sliderValueChanged(juce::Slider* slider) override
  {