SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert m_disableChaperone to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent be6a21d321
commit d47c570537
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/ChaperoneTabController.cpp
+10 -8
View File
@@ -20,12 +20,11 @@ void ChaperoneTabController::initStage1()
= settings->value( "chaperoneAlarmSoundDistance", 0.5f ).toFloat(); = settings->value( "chaperoneAlarmSoundDistance", 0.5f ).toFloat();
m_chaperoneShowDashboardDistance m_chaperoneShowDashboardDistance
= settings->value( "chaperoneShowDashboardDistance", 0.5f ).toFloat(); = settings->value( "chaperoneShowDashboardDistance", 0.5f ).toFloat();
m_disableChaperone = settings->value( "disableChaperone", false ).toBool();
m_fadeDistanceRemembered m_fadeDistanceRemembered
= settings->value( "fadeDistanceRemembered", 0.5f ).toFloat(); = settings->value( "fadeDistanceRemembered", 0.5f ).toFloat();
settings->endGroup(); settings->endGroup();
if ( m_disableChaperone ) if ( disableChaperone() )
{ {
setFadeDistance( 0.0f, true ); setFadeDistance( 0.0f, true );
} }
@@ -873,7 +872,8 @@ bool ChaperoneTabController::isChaperoneAlarmSoundAdjustVolume() const
bool ChaperoneTabController::disableChaperone() const bool ChaperoneTabController::disableChaperone() const
{ {
return m_disableChaperone; return settings::getSetting(
settings::BoolSetting::CHAPERONE_disableChaperone );
} }
float ChaperoneTabController::chaperoneAlarmSoundDistance() const float ChaperoneTabController::chaperoneAlarmSoundDistance() const
@@ -1155,10 +1155,9 @@ void ChaperoneTabController::setChaperoneShowDashboardDistance( float value,
void ChaperoneTabController::setDisableChaperone( bool value, bool notify ) void ChaperoneTabController::setDisableChaperone( bool value, bool notify )
{ {
if ( m_disableChaperone != value ) if ( disableChaperone() != value )
{ {
m_disableChaperone = value; if ( value )
if ( m_disableChaperone )
{ {
m_fadeDistanceRemembered = m_fadeDistance; m_fadeDistanceRemembered = m_fadeDistance;
setFadeDistance( 0.0f, true ); setFadeDistance( 0.0f, true );
@@ -1167,16 +1166,19 @@ void ChaperoneTabController::setDisableChaperone( bool value, bool notify )
{ {
setFadeDistance( m_fadeDistanceRemembered, true ); setFadeDistance( m_fadeDistanceRemembered, true );
} }
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" ); settings->beginGroup( "chaperoneSettings" );
settings->setValue( "fadeDistanceRemembered", settings->setValue( "fadeDistanceRemembered",
m_fadeDistanceRemembered ); m_fadeDistanceRemembered );
settings->setValue( "disableChaperone", m_disableChaperone );
settings->endGroup(); settings->endGroup();
settings->sync(); settings->sync();
settings::setSetting( settings::BoolSetting::CHAPERONE_disableChaperone,
value );
if ( notify ) if ( notify )
{ {
emit disableChaperoneChanged( m_disableChaperone ); emit disableChaperoneChanged( value );
} }
} }
} }
src/tabcontrollers/ChaperoneTabController.h
-1
View File
@@ -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;
bool m_disableChaperone = false;
float m_fadeDistanceRemembered = 0.0f; float m_fadeDistanceRemembered = 0.0f;
float m_chaperoneSwitchToBeginnerDistance = 0.5f; float m_chaperoneSwitchToBeginnerDistance = 0.5f;