diff --git a/opengl/Quantum.cpp b/opengl/Quantum.cpp index 0ba23f0..f250f6a 100644 --- a/opengl/Quantum.cpp +++ b/opengl/Quantum.cpp @@ -426,8 +426,8 @@ QuantumRadioSwitch::~QuantumRadioSwitch() void QuantumRadioSwitch::adjustSize() { - const uint width = theme.fontSize * 3.333 + theme.borderSize * 2; - const uint height = theme.fontSize * 1.666 + theme.borderSize * 2; + const uint width = theme.fontSize * 3 + theme.borderSize * 2; + const uint height = theme.fontSize * 1.333 + theme.borderSize * 2; setSize(width, height); } @@ -452,7 +452,7 @@ void QuantumRadioSwitch::onNanoDisplay() beginPath(); circle(checked ? theme.borderSize * 3 + radioSize : width - radioSize - theme.borderSize * 2, - radioSize + theme.borderSize * 3, + radioSize + theme.borderSize * 3.333, radioSize); fill(); @@ -460,7 +460,7 @@ void QuantumRadioSwitch::onNanoDisplay() textAlign(ALIGN_CENTER|ALIGN_MIDDLE); if (checked) - text(getWidth() * 0.666 + theme.borderSize * 2, getHeight() / 2, "on", nullptr); + text(getWidth() * 0.666, getHeight() / 2, "on", nullptr); else text(getWidth() * 0.333 - theme.borderSize, getHeight() / 2, "off", nullptr); } diff --git a/opengl/Quantum.hpp b/opengl/Quantum.hpp index 6172273..dbfd4bc 100644 --- a/opengl/Quantum.hpp +++ b/opengl/Quantum.hpp @@ -114,8 +114,8 @@ struct QuantumMetrics theme.textHeight / 2 + theme.borderSize * 2), normalSwitch(theme.fontSize * 2 + theme.borderSize * 2, theme.fontSize + theme.borderSize * 2), - radioSwitch(theme.fontSize * 3.333 + theme.borderSize * 2, - theme.fontSize * 1.666 + theme.borderSize * 2), + radioSwitch(theme.fontSize * 3 + theme.borderSize * 2, + theme.fontSize * 1.333 + theme.borderSize * 2), gainReductionMeter(theme.textHeight * 2, theme.textHeight * 4), knob(theme.textHeight * 3 / 2,