Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-31 04:25:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed an issue where the bar and knob in SliderComponent were not correctly aligned vertically.

Browse source
This commit is contained in:
Leon Styhre 2021-10-23 15:36:16 +02:00
parent 022f8c7e8b
commit bd62f2af14
2 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,15 +15,16 @@
SliderComponent::SliderComponent( SliderComponent::SliderComponent(
Window* window, float min, float max, float increment, const std::string& suffix) Window* window, float min, float max, float increment, const std::string& suffix)
: GuiComponent(window) : GuiComponent{window}
, mMin(min) , mMin{min}
, mMax(max) , mMax{max}
, mSingleIncrement(increment) , mSingleIncrement{increment}
, mMoveRate(0) , mMoveRate{0.0f}
, mKnob(window) , mBarHeight{0.0f}
, mSuffix(suffix) , mKnob{window}
, mSuffix{suffix}
{ {
assert((min - max) != 0); assert((min - max) != 0.0f);
// Some sane default value. // Some sane default value.
mValue = (max + min) / 2.0f; mValue = (max + min) / 2.0f;
@ -41,7 +42,7 @@ bool SliderComponent::input(InputConfig* config, Input input)
if (input.value) if (input.value)
setValue(mValue - mSingleIncrement); setValue(mValue - mSingleIncrement);
mMoveRate = input.value ? -mSingleIncrement : 0; mMoveRate = input.value ? -mSingleIncrement : 0.0f;
mMoveAccumulator = -MOVE_REPEAT_DELAY; mMoveAccumulator = -MOVE_REPEAT_DELAY;
return true; return true;
} }
@ -49,13 +50,13 @@ bool SliderComponent::input(InputConfig* config, Input input)
if (input.value) if (input.value)
setValue(mValue + mSingleIncrement); setValue(mValue + mSingleIncrement);
mMoveRate = input.value ? mSingleIncrement : 0; mMoveRate = input.value ? mSingleIncrement : 0.0f;
mMoveAccumulator = -MOVE_REPEAT_DELAY; mMoveAccumulator = -MOVE_REPEAT_DELAY;
return true; return true;
} }
} }
else { else {
mMoveRate = 0; mMoveRate = 0.0f;
} }
return GuiComponent::input(config, input); return GuiComponent::input(config, input);
@ -88,10 +89,9 @@ void SliderComponent::render(const glm::mat4& parentTrans)
mValueCache->metrics.size.x + (4.0f * Renderer::getScreenWidthModifier()) : mValueCache->metrics.size.x + (4.0f * Renderer::getScreenWidthModifier()) :
0.0f)}; 0.0f)};
// Render line. // Render bar.
const float lineWidth{2.0f * Renderer::getScreenHeightModifier()}; Renderer::drawRect(mKnob.getSize().x / 2.0f, mSize.y / 2.0f - mBarHeight / 2.0f, width,
Renderer::drawRect(mKnob.getSize().x / 2.0f, mSize.y / 2.0f - lineWidth / 2.0f, width, mBarHeight, 0x777777FF, 0x777777FF);
lineWidth, 0x777777FF, 0x777777FF);
// Render knob. // Render knob.
mKnob.render(trans); mKnob.render(trans);
@ -143,14 +143,28 @@ void SliderComponent::onValueChanged()
mValueCache->metrics.size.x = textSize.x; // Fudge the width. mValueCache->metrics.size.x = textSize.x; // Fudge the width.
} }
// Update knob position/size. mKnob.setResize(0.0f, std::round(mSize.y * 0.7f));
mKnob.setResize(0, mSize.y * 0.7f);
float lineLength = float barLength =
mSize.x - mKnob.getSize().x - mSize.x - mKnob.getSize().x -
(mValueCache ? mValueCache->metrics.size.x + (4.0f * Renderer::getScreenWidthModifier()) : (mValueCache ? mValueCache->metrics.size.x + (4.0f * Renderer::getScreenWidthModifier()) :
0.0f); 0.0f);
mKnob.setPosition(((mValue - mMin / 2.0f) / mMax) * lineLength + mKnob.getSize().x / 2.0f, int barHeight = static_cast<int>(std::round(2.0f * Renderer::getScreenHeightModifier()));
// For very low resolutions, make sure the bar height is not rounded to zero.
if (barHeight == 0)
barHeight = 1;
// Resize the knob one pixel if necessary to keep the bar centered.
if (barHeight % 2 == 0 && static_cast<int>(mKnob.getSize().y) % 2 != 0)
mKnob.setResize(mKnob.getSize().x - 1.0f, mKnob.getSize().y - 1.0f);
else if (barHeight == 1 && static_cast<int>(mKnob.getSize().y) % 2 == 0)
mKnob.setResize(mKnob.getSize().x - 1.0f, mKnob.getSize().y - 1);
mBarHeight = static_cast<float>(barHeight);
mKnob.setPosition(((mValue - mMin / 2.0f) / mMax) * barLength + mKnob.getSize().x / 2.0f,
mSize.y / 2.0f); mSize.y / 2.0f);
} }

1
es-core/src/components/SliderComponent.h
View file

@ -45,6 +45,7 @@ private:
float mValue; float mValue;
float mSingleIncrement; float mSingleIncrement;
float mMoveRate; float mMoveRate;
float mBarHeight;
int mMoveAccumulator; int mMoveAccumulator;
ImageComponent mKnob; ImageComponent mKnob;