Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 07:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed two SliderComponent issues with inconsistent knob placements.

Browse source 
Also improved the component for use with vertical resolutions and cleaned up some code.
This commit is contained in:
Leon Styhre 2022-09-28 17:23:44 +02:00
parent f048d06b95
commit 2c84e9c59b
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
es-core/src/components/SliderComponent.cpp
View file

@ -90,16 +90,19 @@ void SliderComponent::render(const glm::mat4& parentTrans)
float width {mSize.x - mKnob.getSize().x - float width {mSize.x - mKnob.getSize().x -
(mTextCache ? (mTextCache ?
mTextCache->metrics.size.x + (4.0f * Renderer::getScreenWidthModifier()) : mTextCache->metrics.size.x + (4.0f * mRenderer->getScreenWidthModifier()) :
0.0f)}; 0.0f)};
// Render suffix. // Render suffix.
if (mTextCache) if (mTextCache)
mFont->renderTextCache(mTextCache.get()); mFont->renderTextCache(mTextCache.get());
const float barPosY {mBarHeight == 1.0f ? std::floor(mSize.y / 2.0f - mBarHeight / 2.0f) :
std::round(mSize.y / 2.0f - mBarHeight / 2.0f)};
// Render bar. // Render bar.
mRenderer->drawRect(mKnob.getSize().x / 2.0f, mSize.y / 2.0f - mBarHeight / 2.0f, width, mRenderer->drawRect(mKnob.getSize().x / 2.0f, barPosY, width, mBarHeight, 0x777777FF,
mBarHeight, 0x777777FF, 0x777777FF); 0x777777FF);
// Render knob. // Render knob.
mKnob.render(trans); mKnob.render(trans);
@ -135,7 +138,7 @@ void SliderComponent::onValueChanged()
ss.precision(0); ss.precision(0);
ss << mValue; ss << mValue;
ss << mSuffix; ss << mSuffix;
const std::string val = ss.str(); const std::string val {ss.str()};
ss.str(""); ss.str("");
ss.clear(); ss.clear();
@ -143,9 +146,9 @@ void SliderComponent::onValueChanged()
ss.precision(0); ss.precision(0);
ss << mMax; ss << mMax;
ss << mSuffix; ss << mSuffix;
const std::string max = ss.str(); const std::string max {ss.str()};
glm::vec2 textSize = mFont->sizeText(max); glm::vec2 textSize {mFont->sizeText(max)};
mTextCache = std::shared_ptr<TextCache>(mFont->buildTextCache( mTextCache = std::shared_ptr<TextCache>(mFont->buildTextCache(
val, mSize.x - textSize.x, (mSize.y - textSize.y) / 2.0f, 0x777777FF)); val, mSize.x - textSize.x, (mSize.y - textSize.y) / 2.0f, 0x777777FF));
mTextCache->metrics.size.x = textSize.x; // Fudge the width. mTextCache->metrics.size.x = textSize.x; // Fudge the width.
@ -153,12 +156,19 @@ void SliderComponent::onValueChanged()
mKnob.setResize(0.0f, std::round(mSize.y * 0.7f)); mKnob.setResize(0.0f, std::round(mSize.y * 0.7f));
float barLength = float barLength {
mSize.x - mKnob.getSize().x - mSize.x - mKnob.getSize().x -
(mTextCache ? mTextCache->metrics.size.x + (4.0f * Renderer::getScreenWidthModifier()) : (mTextCache ? mTextCache->metrics.size.x + (4.0f * mRenderer->getScreenWidthModifier()) :
0.0f); 0.0f)};
int barHeight = static_cast<int>(std::round(2.0f * Renderer::getScreenHeightModifier())); int barHeight {0};
if (mRenderer->getScreenWidth() > mRenderer->getScreenHeight()) {
barHeight = static_cast<int>(std::round(2.0f * mRenderer->getScreenHeightModifier()));
}
else {
barHeight =
static_cast<int>(std::round(2.0f * std::round(mRenderer->getScreenWidthModifier())));
}
// For very low resolutions, make sure the bar height is not rounded to zero. // For very low resolutions, make sure the bar height is not rounded to zero.
if (barHeight == 0) if (barHeight == 0)
@ -175,9 +185,11 @@ void SliderComponent::onValueChanged()
} }
mBarHeight = static_cast<float>(barHeight); mBarHeight = static_cast<float>(barHeight);
const float val {(mValue - mMin) / (mMax - mMin)};
// For smooth outer boundaries.
// const float val {glm::smoothstep(mMin, mMax, mValue)};
mKnob.setPosition(((mValue - mMin / 2.0f) / mMax) * barLength + mKnob.getSize().x / 2.0f, mKnob.setPosition(val * barLength + mKnob.getSize().x / 2.0f, mSize.y / 2.0f);
mSize.y / 2.0f);
} }
std::vector<HelpPrompt> SliderComponent::getHelpPrompts() std::vector<HelpPrompt> SliderComponent::getHelpPrompts()