From 58a92f4b2bd123d4849e8f56cfd9de287f71094b Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 16:13:14 +0100
Subject: [PATCH] Convert m_heightToggleOffset to new settings API

Casts inside the function because it's not feasible at the moment to
change all floats to doubles.
---
 .../MoveCenterTabController.cpp               | 22 ++++++++-----------
 src/tabcontrollers/MoveCenterTabController.h  |  1 -
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp
index 81102b9..1b5a6f5 100644
--- a/src/tabcontrollers/MoveCenterTabController.cpp
+++ b/src/tabcontrollers/MoveCenterTabController.cpp
@@ -39,8 +39,6 @@ namespace advsettings
 {
 void MoveCenterTabController::initStage1()
 {
-    m_heightToggleOffset = static_cast<float>( settings::getSetting(
-        settings::DoubleSetting::PLAYSPACE_heightToggleOffset ) );
     m_gravityStrength = static_cast<float>( settings::getSetting(
         settings::DoubleSetting::PLAYSPACE_gravityStrength ) );
     m_flingStrength = static_cast<float>( settings::getSetting(
@@ -658,10 +656,10 @@ void MoveCenterTabController::setHeightToggle( bool value, bool notify )
         // Don't move bump around on y axis if gravity is active
         if ( !m_gravityActive )
         {
-            m_offsetY += m_heightToggleOffset;
+            m_offsetY += heightToggleOffset();
             emit offsetYChanged( m_offsetY );
         }
-        m_gravityFloor = m_heightToggleOffset;
+        m_gravityFloor = heightToggleOffset();
     }
     // detect new deactivate
     else if ( m_heightToggle && !value )
@@ -669,7 +667,7 @@ void MoveCenterTabController::setHeightToggle( bool value, bool notify )
         // Don't move bump around on y axis if gravity is active
         if ( !m_gravityActive )
         {
-            m_offsetY -= m_heightToggleOffset;
+            m_offsetY -= heightToggleOffset();
             emit offsetYChanged( m_offsetY );
         }
         m_gravityFloor = 0.0f;
@@ -684,20 +682,18 @@ void MoveCenterTabController::setHeightToggle( bool value, bool notify )
 
 float MoveCenterTabController::heightToggleOffset() const
 {
-    return m_heightToggleOffset;
+    return static_cast<float>( settings::getSetting(
+        settings::DoubleSetting::PLAYSPACE_heightToggleOffset ) );
 }
 
 void MoveCenterTabController::setHeightToggleOffset( float value, bool notify )
 {
-    m_heightToggleOffset = value;
-    auto settings = OverlayController::appSettings();
-    settings->beginGroup( "playspaceSettings" );
-    settings->setValue( "heightToggleOffset", m_heightToggleOffset );
-    settings->endGroup();
-    settings->sync();
+    settings::setSetting( settings::DoubleSetting::PLAYSPACE_heightToggleOffset,
+                          static_cast<double>( value ) );
+
     if ( notify )
     {
-        emit heightToggleOffsetChanged( m_heightToggleOffset );
+        emit heightToggleOffsetChanged( value );
     }
 }
 
diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h
index 550fae3..4b73725 100644
--- a/src/tabcontrollers/MoveCenterTabController.h
+++ b/src/tabcontrollers/MoveCenterTabController.h
@@ -124,7 +124,6 @@ private:
     vr::TrackedDeviceIndex_t m_activeMoveController;
     float m_lastControllerPosition[3];
     bool m_heightToggle = false;
-    float m_heightToggleOffset = -1.0f;
     float m_gravityFloor = 0.0f;
     float m_gravityStrength = 9.8f;
     float m_flingStrength = 1.0f;