diff --git a/Changes.txt b/Changes.txt index 507bfc84f..48c78a4b6 100644 --- a/Changes.txt +++ b/Changes.txt @@ -23,7 +23,9 @@ * Make NTSC custom phase shift not affect Yellow anymore. - * Allow changing palette adjustables in 1% steps again. + * Allow changing custom palette and TV effects adjustables in 1% steps again. + + * Fixed custom palette and TV effects adjustable slider rounding issue. * Fixed some bugs in 3E+ scheme when using non-standard ROM sizes. diff --git a/src/common/PaletteHandler.cxx b/src/common/PaletteHandler.cxx index 0483b6bb9..ec0d7691b 100644 --- a/src/common/PaletteHandler.cxx +++ b/src/common/PaletteHandler.cxx @@ -139,7 +139,7 @@ void PaletteHandler::changeCurrentAdjustable(int direction) { int newVal = scaleTo100(*myAdjustables[myCurrentAdjustable].value); - newVal = BSPF::clamp(newVal + direction * 2, 0, 100); + newVal = BSPF::clamp(newVal + direction * 1, 0, 100); *myAdjustables[myCurrentAdjustable].value = scaleFrom100(newVal); diff --git a/src/common/tv_filters/NTSCFilter.cxx b/src/common/tv_filters/NTSCFilter.cxx index 8e7e899c9..5a61dd140 100644 --- a/src/common/tv_filters/NTSCFilter.cxx +++ b/src/common/tv_filters/NTSCFilter.cxx @@ -119,7 +119,7 @@ void NTSCFilter::changeCurrentAdjustable(int direction, // return "'Custom' TV mode not selected"; newValue = scaleTo100(*ourCustomAdjustables[myCurrentAdjustable].value); - newValue = BSPF::clamp(newValue + direction * 2, 0, 100); + newValue = BSPF::clamp(newValue + direction * 1, 0, 100); *ourCustomAdjustables[myCurrentAdjustable].value = scaleFrom100(newValue); diff --git a/src/gui/VideoAudioDialog.cxx b/src/gui/VideoAudioDialog.cxx index 7fcc65cf8..23e7692cc 100644 --- a/src/gui/VideoAudioDialog.cxx +++ b/src/gui/VideoAudioDialog.cxx @@ -47,7 +47,7 @@ new SliderWidget(myTab, _font, xpos, ypos-1, swidth, lineHeight, \ desc, lwidth, cmd, fontWidth*4, "%"); \ myTV ## obj->setMinValue(0); myTV ## obj->setMaxValue(100); \ - myTV ## obj->setStepValue(2); \ + myTV ## obj->setStepValue(1); \ myTV ## obj->setTickmarkIntervals(2); \ wid.push_back(myTV ## obj); \ ypos += lineHeight + VGAP; @@ -233,7 +233,6 @@ void VideoAudioDialog::addPaletteTab() CREATE_CUSTOM_SLIDERS(Contrast, "Contrast ", kPaletteUpdated) CREATE_CUSTOM_SLIDERS(Bright, "Brightness ", kPaletteUpdated) CREATE_CUSTOM_SLIDERS(Gamma, "Gamma ", kPaletteUpdated) - myTVHue->setStepValue(1); // The resulting palette xpos = myPhaseShiftNtsc->getRight() + fontWidth * 2;