commit ede125c0670c6d47288c962a29b9d302fa8c7e5f parent b4b2b17cf2475add27258683ffdb233bcae15b0f Author: Oli Larkin <olilarkin@googlemail.com> Date: Mon, 29 May 2023 22:46:04 +0200 Add lines bitmap Diffstat:
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp @@ -103,6 +103,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) const IBitmap fileControlBackground = pGraphics->LoadBitmap(FILECONTROLBACKGROUND_FN); const IBitmap bgBitmap = pGraphics->LoadBitmap(BACKGROUND_FN); + const IBitmap linesBitmap = pGraphics->LoadBitmap(LINES_FN); const IBitmap irSwitchBitmap = pGraphics->LoadBitmap((TOGGLEIR_FN), 2, true); const IBitmap switchHandleBitmap = pGraphics->LoadBitmap((TOGGLE_HANDLE_FN), true); const IBitmap knobBackground = pGraphics->LoadBitmap(KNOBBACKGROUND_FN); @@ -131,9 +132,9 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) const IRECT trebleKnobArea = knobs.GetGridCell(0, kToneTreble, 1, numKnobs).GetPadded(-singleKnobPad); const IRECT outputKnobArea = knobs.GetGridCell(0, kOutputLevel, 1, numKnobs).GetPadded(-singleKnobPad); - const IRECT ngToggleArea = noiseGateArea.GetVShifted(noiseGateArea.H()).SubRectVertical(2, 0); - const IRECT eqToggleArea = midKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0); - const IRECT outNormToggleArea = outputKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0); + const IRECT ngToggleArea = noiseGateArea.GetVShifted(noiseGateArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f); + const IRECT eqToggleArea = midKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f); + const IRECT outNormToggleArea = outputKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f); // Area for IR bypass toggle const float irBypassToggleX = 46.f; @@ -201,6 +202,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) }; pGraphics->AttachBackground(BACKGROUND_FN); + pGraphics->AttachControl(new IBitmapControl(b, linesBitmap)); pGraphics->AttachControl(new IVLabelControl(titleArea, "Neural Amp Modeler", titleStyle)); pGraphics->AttachControl(new ISVGControl(modelArea.GetFromLeft(30).GetTranslated(-40, 10), modelIconSVG)); diff --git a/NeuralAmpModeler/config.h b/NeuralAmpModeler/config.h @@ -87,6 +87,9 @@ #define FILECONTROLBACKGROUND_FN "FileControlBackground.png" #define FILECONTROLBACKGROUND2X_FN "FileControlBackground@2x.png" #define FILECONTROLBACKGROUND3X_FN "FileControlBackground@3x.png" +#define LINES_FN "Lines.png" +#define LINES2X_FN "Lines@2x.png" +#define LINES3X_FN "Lines@3x.png" // Issue 291 // On the macOS standalone, we might not have permissions to traverse the file directory, so we have the app ask the diff --git a/NeuralAmpModeler/resources/img/Lines.png b/NeuralAmpModeler/resources/img/Lines.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/Lines@2x.png b/NeuralAmpModeler/resources/img/Lines@2x.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/Lines@3x.png b/NeuralAmpModeler/resources/img/Lines@3x.png Binary files differ. diff --git a/NeuralAmpModeler/resources/main.rc b/NeuralAmpModeler/resources/main.rc @@ -249,5 +249,7 @@ TOGGLE_HANDLE2X_FN PNG TOGGLE_HANDLE2X_FN MODEL_ICON_FN SVG MODEL_ICON_FN IR_ICON_ON_FN SVG IR_ICON_ON_FN IR_ICON_OFF_FN SVG IR_ICON_OFF_FN +LINES_FN PNG LINES_FN +LINES2X_FN PNG LINES2X_FN ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED
