brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly center Carla, HostAudio and HostCV panel content

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-01-25 00:16:52 +00:00
parent b6df853376
commit f697f692cd
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/Cardinal/src/Carla.cpp
View file

@ -447,7 +447,7 @@ struct CarlaModuleWidget : ModuleWidget, IdleCallback {
static constexpr const float startX_Out = 96.0f; static constexpr const float startX_Out = 96.0f;
static constexpr const float startY = 74.0f; static constexpr const float startY = 74.0f;
static constexpr const float padding = 29.0f; static constexpr const float padding = 29.0f;
static constexpr const float middleX = startX_In + (startX_Out - startX_In) * 0.5f + padding * 0.25f; static constexpr const float middleX = startX_In + (startX_Out - startX_In) * 0.5f + padding * 0.35f;
CarlaModule* const module; CarlaModule* const module;
bool idleCallbackActive = false; bool idleCallbackActive = false;
@ -584,10 +584,9 @@ struct CarlaModuleWidget : ModuleWidget, IdleCallback {
nvgFontFaceId(args.vg, 0); nvgFontFaceId(args.vg, 0);
nvgFontSize(args.vg, 11); nvgFontSize(args.vg, 11);
nvgTextAlign(args.vg, NVG_ALIGN_CENTER); nvgTextAlign(args.vg, NVG_ALIGN_CENTER);
// nvgTextBounds(vg, 0, 0, text, nullptr, nullptr);
nvgBeginPath(args.vg); nvgBeginPath(args.vg);
nvgRoundedRect(args.vg, startX_Out - 4.0f, startY - 2.0f, padding, padding * CarlaModule::NUM_INPUTS, 4); nvgRoundedRect(args.vg, startX_Out - 2.5f, startY - 2.0f, padding, padding * CarlaModule::NUM_INPUTS, 4);
nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0)); nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0));
nvgFill(args.vg); nvgFill(args.vg);

14
plugins/Cardinal/src/HostAudio.cpp
View file

@ -132,7 +132,7 @@ struct HostAudioWidget : ModuleWidget {
static constexpr const float startX_Out = 96.0f; static constexpr const float startX_Out = 96.0f;
static constexpr const float startY = 74.0f; static constexpr const float startY = 74.0f;
static constexpr const float padding = 29.0f; static constexpr const float padding = 29.0f;
static constexpr const float middleX = startX_In + (startX_Out - startX_In) * 0.5f + padding * 0.25f; static constexpr const float middleX = startX_In + (startX_Out - startX_In) * 0.5f + padding * 0.35f;
HostAudio<numIO>* const module; HostAudio<numIO>* const module;
@ -159,12 +159,12 @@ struct HostAudioWidget : ModuleWidget {
} }
} }
void drawTextLine(NVGcontext* const vg, const float offsetX, const uint posY, const char* const text) void drawTextLine(NVGcontext* const vg, const uint posY, const char* const text)
{ {
const float y = startY + posY * padding; const float y = startY + posY * padding;
nvgBeginPath(vg); nvgBeginPath(vg);
nvgFillColor(vg, color::WHITE); nvgFillColor(vg, color::WHITE);
nvgText(vg, middleX + offsetX, y + 16, text, nullptr); nvgText(vg, middleX, y + 16, text, nullptr);
} }
void draw(const DrawArgs& args) override void draw(const DrawArgs& args) override
@ -180,21 +180,21 @@ struct HostAudioWidget : ModuleWidget {
nvgTextAlign(args.vg, NVG_ALIGN_CENTER); nvgTextAlign(args.vg, NVG_ALIGN_CENTER);
nvgBeginPath(args.vg); nvgBeginPath(args.vg);
nvgRoundedRect(args.vg, startX_Out - 4.0f, startY - 2.0f, padding, padding * numIO, 4); nvgRoundedRect(args.vg, startX_Out - 2.5f, startY - 2.0f, padding, padding * numIO, 4);
nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0)); nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0));
nvgFill(args.vg); nvgFill(args.vg);
if (numIO == 2) if (numIO == 2)
{ {
drawTextLine(args.vg, 3.0f, 0, "Left/Mono"); drawTextLine(args.vg, 0, "Left/Mono");
drawTextLine(args.vg, 0.0f, 1, "Right"); drawTextLine(args.vg, 1, "Right");
} }
else else
{ {
for (int i=0; i<numIO; ++i) for (int i=0; i<numIO; ++i)
{ {
char text[] = {'A','u','d','i','o',' ',static_cast<char>('0'+i+1),'\0'}; char text[] = {'A','u','d','i','o',' ',static_cast<char>('0'+i+1),'\0'};
drawTextLine(args.vg, 0.0f, i, text); drawTextLine(args.vg, i, text);
} }
} }

5
plugins/Cardinal/src/HostCV.cpp
View file

@ -103,7 +103,7 @@ struct HostCVWidget : ModuleWidget {
static constexpr const float startX_Out = 96.0f; static constexpr const float startX_Out = 96.0f;
static constexpr const float startY = 74.0f; static constexpr const float startY = 74.0f;
static constexpr const float padding = 29.0f; static constexpr const float padding = 29.0f;
static constexpr const float middleX = startX_In + (startX_Out - startX_In) * 0.5f + padding * 0.25f; static constexpr const float middleX = startX_In + (startX_Out - startX_In) * 0.5f + padding * 0.35f;
HostCVWidget(HostCV* const module) HostCVWidget(HostCV* const module)
{ {
@ -141,10 +141,9 @@ struct HostCVWidget : ModuleWidget {
nvgFontFaceId(args.vg, 0); nvgFontFaceId(args.vg, 0);
nvgFontSize(args.vg, 11); nvgFontSize(args.vg, 11);
nvgTextAlign(args.vg, NVG_ALIGN_CENTER); nvgTextAlign(args.vg, NVG_ALIGN_CENTER);
// nvgTextBounds(vg, 0, 0, text, nullptr, nullptr);
nvgBeginPath(args.vg); nvgBeginPath(args.vg);
nvgRoundedRect(args.vg, startX_Out - 4.0f, startY - 2.0f, padding, padding * HostCV::NUM_INPUTS, 4); nvgRoundedRect(args.vg, startX_Out - 2.5f, startY - 2.0f, padding, padding * HostCV::NUM_INPUTS, 4);
nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0)); nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0));
nvgFill(args.vg); nvgFill(args.vg);