Convert m_settingsLeftHandDragEnabled to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent a81eb2cbf4
commit c1b1756ccf
2 changed files with 14 additions and 17 deletions
+14 -16
View File
@@ -39,8 +39,6 @@ namespace advsettings
{ {
void MoveCenterTabController::initStage1() void MoveCenterTabController::initStage1()
{ {
m_settingsLeftHandDragEnabled = settings::getSetting(
settings::BoolSetting::PLAYSPACE_moveShortcutLeft );
m_settingsLeftHandTurnEnabled m_settingsLeftHandTurnEnabled
= settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft ); = settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft );
m_settingsRightHandTurnEnabled = settings::getSetting( m_settingsRightHandTurnEnabled = settings::getSetting(
@@ -218,7 +216,8 @@ void MoveCenterTabController::deleteOffsetProfile( unsigned index )
void MoveCenterTabController::outputLogSettings() void MoveCenterTabController::outputLogSettings()
{ {
if ( m_settingsLeftHandDragEnabled ) if ( settings::getSetting(
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Drag Bind Enabled"; LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Drag Bind Enabled";
} }
@@ -618,23 +617,19 @@ void MoveCenterTabController::setMoveShortcutRight( bool value, bool notify )
bool MoveCenterTabController::moveShortcutLeft() const bool MoveCenterTabController::moveShortcutLeft() const
{ {
return m_settingsLeftHandDragEnabled; return settings::getSetting(
settings::BoolSetting::PLAYSPACE_moveShortcutLeft );
} }
void MoveCenterTabController::setMoveShortcutLeft( bool value, bool notify ) void MoveCenterTabController::setMoveShortcutLeft( bool value, bool notify )
{ {
m_settingsLeftHandDragEnabled = value; settings::setSetting( settings::BoolSetting::PLAYSPACE_moveShortcutLeft,
auto settings = OverlayController::appSettings(); value );
settings->beginGroup( "playspaceSettings" );
settings->setValue( "moveShortcutLeft", m_settingsLeftHandDragEnabled );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit moveShortcutLeftChanged( m_settingsLeftHandDragEnabled ); emit moveShortcutLeftChanged( value );
} }
LOG( INFO ) << "CHANGED SETTINGS: Left Hand Space-Drag Bind Enable Set: "
<< m_settingsLeftHandDragEnabled;
} }
bool MoveCenterTabController::turnBindLeft() const bool MoveCenterTabController::turnBindLeft() const
@@ -1535,7 +1530,8 @@ float MoveCenterTabController::getBoundsBasisMaxY()
void MoveCenterTabController::leftHandSpaceDrag( bool leftHandDragActive ) void MoveCenterTabController::leftHandSpaceDrag( bool leftHandDragActive )
{ {
if ( !m_settingsLeftHandDragEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
return; return;
} }
@@ -1643,7 +1639,8 @@ void MoveCenterTabController::rightHandSpaceDrag( bool rightHandDragActive )
void MoveCenterTabController::optionalOverrideLeftHandSpaceDrag( void MoveCenterTabController::optionalOverrideLeftHandSpaceDrag(
bool overrideLeftHandDragActive ) bool overrideLeftHandDragActive )
{ {
if ( !m_settingsLeftHandDragEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
return; return;
} }
@@ -1748,7 +1745,8 @@ void MoveCenterTabController::optionalOverrideRightHandSpaceDrag(
void MoveCenterTabController::swapSpaceDragToLeftHandOverride( void MoveCenterTabController::swapSpaceDragToLeftHandOverride(
bool swapDragToLeftHand ) bool swapDragToLeftHand )
{ {
if ( !m_settingsLeftHandDragEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
return; return;
} }
@@ -125,7 +125,6 @@ private:
bool m_moveShortcutLeftPressed = false; bool m_moveShortcutLeftPressed = false;
vr::TrackedDeviceIndex_t m_activeMoveController; vr::TrackedDeviceIndex_t m_activeMoveController;
float m_lastControllerPosition[3]; float m_lastControllerPosition[3];
bool m_settingsLeftHandDragEnabled = false;
bool m_settingsLeftHandTurnEnabled = false; bool m_settingsLeftHandTurnEnabled = false;
bool m_settingsRightHandTurnEnabled = false; bool m_settingsRightHandTurnEnabled = false;
unsigned m_dragComfortFactor = 0; unsigned m_dragComfortFactor = 0;