Convert m_fadeDistanceRemembered to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 0c07f0c207
commit ec73c54f3e
2 changed files with 8 additions and 15 deletions
+8 -14
View File
@@ -9,12 +9,6 @@ namespace advsettings
{ {
void ChaperoneTabController::initStage1() void ChaperoneTabController::initStage1()
{ {
auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" );
m_fadeDistanceRemembered
= settings->value( "fadeDistanceRemembered", 0.5f ).toFloat();
settings->endGroup();
if ( disableChaperone() ) if ( disableChaperone() )
{ {
setFadeDistance( 0.0f, true ); setFadeDistance( 0.0f, true );
@@ -1138,20 +1132,20 @@ void ChaperoneTabController::setDisableChaperone( bool value, bool notify )
{ {
if ( value ) if ( value )
{ {
m_fadeDistanceRemembered = m_fadeDistance; settings::setSetting(
settings::DoubleSetting::CHAPERONE_fadeDistanceRemembered,
static_cast<double>( value ) );
setFadeDistance( 0.0f, true ); setFadeDistance( 0.0f, true );
} }
else else
{ {
setFadeDistance( m_fadeDistanceRemembered, true ); setFadeDistance( static_cast<float>( settings::getSetting(
settings::DoubleSetting::
CHAPERONE_fadeDistanceRemembered ) ),
true );
} }
auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" );
settings->setValue( "fadeDistanceRemembered",
m_fadeDistanceRemembered );
settings->endGroup();
settings->sync();
settings::setSetting( settings::BoolSetting::CHAPERONE_disableChaperone, settings::setSetting( settings::BoolSetting::CHAPERONE_disableChaperone,
value ); value );
@@ -134,7 +134,6 @@ private:
bool m_centerMarker = false; bool m_centerMarker = false;
bool m_playSpaceMarker = false; bool m_playSpaceMarker = false;
bool m_forceBounds = false; bool m_forceBounds = false;
float m_fadeDistanceRemembered = 0.0f;
bool m_chaperoneSwitchToBeginnerActive = false; bool m_chaperoneSwitchToBeginnerActive = false;
int32_t m_chaperoneSwitchToBeginnerLastStyle = 0; int32_t m_chaperoneSwitchToBeginnerLastStyle = 0;