ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't calculate palette before all sliders have initialized." 

This reverts commit ad7e543dac.

Added clamping of the returned SliderWidget values to valid range instead
This commit is contained in:
thrust26 2020-11-08 18:25:24 +01:00
parent ad7e543dac
commit 0d184f7a80
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/VideoAudioDialog.cxx
View File

@ -941,49 +941,21 @@ void VideoAudioDialog::handlePaletteUpdate()
// TIA Palette // TIA Palette
instance().settings().setValue("palette", instance().settings().setValue("palette",
myTIAPalette->getSelectedTag().toString()); myTIAPalette->getSelectedTag().toString());
// Palette adjustables // Palette adjustables
PaletteHandler::Adjustable paletteAdj; PaletteHandler::Adjustable paletteAdj;
if (myPhaseShiftNtsc->getValue() < 0) return;
paletteAdj.phaseNtsc = myPhaseShiftNtsc->getValue(); paletteAdj.phaseNtsc = myPhaseShiftNtsc->getValue();
if (myPhaseShiftPal->getValue() < 0) return;
paletteAdj.phasePal = myPhaseShiftPal->getValue(); paletteAdj.phasePal = myPhaseShiftPal->getValue();
if (myTVRedScale->getValue() < 0) return;
paletteAdj.redScale = myTVRedScale->getValue(); paletteAdj.redScale = myTVRedScale->getValue();
if (myTVRedShift->getValue() < 0) return;
paletteAdj.redShift = myTVRedShift->getValue(); paletteAdj.redShift = myTVRedShift->getValue();
if (myTVGreenScale->getValue() < 0) return;
paletteAdj.greenScale = myTVGreenScale->getValue(); paletteAdj.greenScale = myTVGreenScale->getValue();
if (myTVGreenShift->getValue() < 0) return;
paletteAdj.greenShift = myTVGreenShift->getValue(); paletteAdj.greenShift = myTVGreenShift->getValue();
if (myTVBlueScale->getValue() < 0) return;
paletteAdj.blueScale = myTVBlueScale->getValue(); paletteAdj.blueScale = myTVBlueScale->getValue();
if (myTVBlueShift->getValue() < 0) return;
paletteAdj.blueShift = myTVBlueShift->getValue(); paletteAdj.blueShift = myTVBlueShift->getValue();
if (myTVHue->getValue() < 0) return;
paletteAdj.hue = myTVHue->getValue(); paletteAdj.hue = myTVHue->getValue();
if (myTVSatur->getValue() < 0) return;
paletteAdj.saturation = myTVSatur->getValue(); paletteAdj.saturation = myTVSatur->getValue();
if (myTVContrast->getValue() < 0) return;
paletteAdj.contrast = myTVContrast->getValue(); paletteAdj.contrast = myTVContrast->getValue();
if (myTVBright->getValue() < 0) return;
paletteAdj.brightness = myTVBright->getValue(); paletteAdj.brightness = myTVBright->getValue();
if (myTVGamma->getValue() < 0) return;
paletteAdj.gamma = myTVGamma->getValue(); paletteAdj.gamma = myTVGamma->getValue();
instance().frameBuffer().tiaSurface().paletteHandler().setAdjustables(paletteAdj); instance().frameBuffer().tiaSurface().paletteHandler().setAdjustables(paletteAdj);
if(instance().hasConsole()) if(instance().hasConsole())

2
src/gui/Widget.hxx
View File

@ -336,7 +336,7 @@ class SliderWidget : public ButtonWidget
~SliderWidget() override = default; ~SliderWidget() override = default;
void setValue(int value); void setValue(int value);
int getValue() const { return _value; } int getValue() const { return BSPF::clamp(_value, _valueMin, _valueMax); }
void setMinValue(int value); void setMinValue(int value);
int getMinValue() const { return _valueMin; } int getMinValue() const { return _valueMin; }