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

Convert m_colorOverlayEnabled to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 117b0f65eb
commit fb1cd0c93f
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/VideoTabController.cpp
+7 -7
View File
@@ -223,8 +223,7 @@ void VideoTabController::reloadVideoConfig()
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() ); settings->beginGroup( getSettingsName() );
setBrightnessEnabled( brightnessEnabled(), true ); setBrightnessEnabled( brightnessEnabled(), true );
setColorOverlayEnabled( setColorOverlayEnabled( colorOverlayEnabled(), true );
settings->value( "colorOverlayEnabled", false ).toBool(), true );
setIsOverlayMethodActive( setIsOverlayMethodActive(
settings->value( "isOverlayMethodActive", false ).toBool(), true ); settings->value( "isOverlayMethodActive", false ).toBool(), true );
setColorRed( colorRed() ); setColorRed( colorRed() );
@@ -241,7 +240,6 @@ void VideoTabController::saveVideoConfig()
{ {
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() ); settings->beginGroup( getSettingsName() );
settings->setValue( "colorOverlayEnabled", colorOverlayEnabled() );
settings->setValue( "isOverlayMethodActive", isOverlayMethodActive() ); settings->setValue( "isOverlayMethodActive", isOverlayMethodActive() );
settings->endGroup(); settings->endGroup();
@@ -370,7 +368,8 @@ void VideoTabController::setBrightnessOpacityValue()
bool VideoTabController::colorOverlayEnabled() const bool VideoTabController::colorOverlayEnabled() const
{ {
return m_colorOverlayEnabled; return settings::getSetting(
settings::BoolSetting::VIDEO_colorOverlayEnabled );
} }
float VideoTabController::colorOverlayOpacity() const float VideoTabController::colorOverlayOpacity() const
@@ -429,11 +428,12 @@ void VideoTabController::setColorOverlayEnabled( bool value,
bool notify, bool notify,
bool keepValue ) bool keepValue )
{ {
if ( value != m_colorOverlayEnabled || keepValue ) if ( value != colorOverlayEnabled() || keepValue )
{ {
if ( !keepValue ) if ( !keepValue )
{ {
m_colorOverlayEnabled = value; settings::setSetting(
settings::BoolSetting::VIDEO_colorOverlayEnabled, value );
} }
auto overlayHandle = getColorOverlayHandle(); auto overlayHandle = getColorOverlayHandle();
if ( value ) if ( value )
@@ -452,7 +452,7 @@ void VideoTabController::setColorOverlayEnabled( bool value,
LOG( INFO ) << "Color Overlay toggled off"; LOG( INFO ) << "Color Overlay toggled off";
} }
} }
saveVideoConfig();
if ( notify ) if ( notify )
{ {
emit colorOverlayEnabledChanged( value ); emit colorOverlayEnabledChanged( value );
src/tabcontrollers/VideoTabController.h
-2
View File
@@ -85,8 +85,6 @@ private:
bool m_overlayInit = false; bool m_overlayInit = false;
bool m_isOverlayMethodActive = false; bool m_isOverlayMethodActive = false;
bool m_colorOverlayEnabled = false;
float m_superSampling = 1.0; float m_superSampling = 1.0;
bool m_allowSupersampleOverride = false; bool m_allowSupersampleOverride = false;
bool m_motionSmoothing = true; bool m_motionSmoothing = true;