commit c67c3aff23be00cb1b4fe16fae491d2496e8b399
parent af4d2b0f6334b0f311674da9288aa746adbbc907
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Thu, 10 Feb 2022 21:02:37 +0100
fix compile errors in UI 2
Diffstat:
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/source/jucePlugin/ui2/VirusEditor.h b/source/jucePlugin/ui2/VirusEditor.h
@@ -15,7 +15,7 @@ class ArpEditor;
class PatchBrowser;
class AudioProcessorEditor;
-class VirusEditor : public juce::Component, private KeyListener
+class VirusEditor : public juce::Component, private juce::KeyListener
{
public:
VirusEditor(VirusParameterBinding &_parameterBinding, AudioPluginAudioProcessor &_processorRef);
@@ -26,7 +26,7 @@ public:
void ShowMenuePatchList();
void ShowMainMenue();
void updateParts();
- bool keyPressed(const KeyPress &k, Component *c) override;
+ bool keyPressed(const juce::KeyPress &k, Component *c) override;
enum Commands {
None,
@@ -46,7 +46,7 @@ private:
juce::Label m_version;
juce::Label m_SynthModel;
- HyperlinkButton m_hyperLink { "donate: paypal.me/dsp56300", { "http://www.paypal.me/dsp56300" } };
+ juce::HyperlinkButton m_hyperLink { "donate: paypal.me/dsp56300", { "http://www.paypal.me/dsp56300" } };
juce::Label m_RomName;
juce::Label m_patchName;
juce::Label m_controlLabel;
diff --git a/source/jucePlugin/ui2/Virus_LookAndFeel.h b/source/jucePlugin/ui2/Virus_LookAndFeel.h
@@ -1,7 +1,6 @@
#pragma once
#include <juce_gui_extra/juce_gui_extra.h>
-#include "BinaryData.h"
constexpr auto comboBoxHeight = 38;
constexpr auto comboBoxWidth = 126;
@@ -24,18 +23,18 @@ namespace Virus
class CustomLAF : public juce::LookAndFeel_V4
{
public:
- void drawLabel(Graphics& g, Label& l) override
+ void drawLabel(juce::Graphics& g, juce::Label& l) override
{
// g.fillAll (label.findColour (Label::backgroundColourId));
- g.setColour (l.findColour (Label::backgroundColourId));
+ g.setColour (l.findColour (juce::Label::backgroundColourId));
g.fillRoundedRectangle (l.getLocalBounds().toFloat(), 5);
// g.drawRect (label.getLocalBounds());
g.drawRoundedRectangle (l.getLocalBounds().toFloat(), 10, 1);
}
- juce::Font getLabelFont(Label& label) override
+ juce::Font getLabelFont(juce::Label& label) override
{
- Font fFont(getCustomFont().getTypeface());
+ juce::Font fFont(getCustomFont().getTypeface());
fFont.setHeight(20.f);
return fFont;
}
@@ -71,7 +70,7 @@ namespace Virus
float rotaryStartAngle, float rotaryEndAngle, juce::Slider &sSlider) override;
- Typeface::Ptr getTypefaceForFont (const juce::Font& f) override
+ juce::Typeface::Ptr getTypefaceForFont (const juce::Font& f) override
{
return getCustomFont().getTypeface();
}
@@ -80,21 +79,21 @@ namespace Virus
juce::Font getComboBoxFont (juce::ComboBox& ) override
{
- Font fFont(getCustomFont().getTypeface());
+ juce::Font fFont(getCustomFont().getTypeface());
fFont.setHeight(20.f);
return fFont;
}
- juce::Font getTextButtonFont(TextButton& button, int buttonHeight) override
+ juce::Font getTextButtonFont(juce::TextButton& button, int buttonHeight) override
{
- Font fFont(getCustomFont().getTypeface());
+ juce::Font fFont(getCustomFont().getTypeface());
fFont.setHeight(20.f);
return fFont;
}
juce::Font getPopupMenuFont() override
{
- Font fFont(getCustomFont().getTypeface());
+ juce::Font fFont(getCustomFont().getTypeface());
fFont.setHeight(20.f);
return fFont;
}