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

Save desktop width setting

Browse Source 
The 2 seconds is arbitrarily chosen. The problem seems to be that
Valve's own overlays are not being initialized before custom overlays,
leading to the Desktop overlay sometimes not being present when our
overlay initializes.

The second if statement inside the first one checking a second time is
definitely a little disgusting, but for now it gets the job done.

The 4.0 default was arbitrarily chosen by whoever decided to initialize
the variable in the class.
This commit is contained in:
Vasily
2019-03-10 23:12:26 +01:00
committed by username223
parent 1d103a5265
commit 9f85af81d1
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/UtilitiesTabController.cpp
+26 -14
View File
@@ -2,6 +2,7 @@
#include <QQuickWindow>
#include <QApplication>
#include "../overlaycontroller.h"
#include <chrono>
#include <thread>
#ifdef _WIN32
# include "keyboardinput/KeyboardInputWindows.h"
@@ -27,12 +28,13 @@ void UtilitiesTabController::initStage1()
auto qAlarmIsModal = settings->value( "alarmIsModal", m_alarmIsModal );
auto qAlarmHour = settings->value( "alarmHour", 0 );
auto qAlarmMinute = settings->value( "alarmMinute", 0 );
auto qDesktopWidth = settings->value( "desktopWidth", 4.0 );
settings->endGroup();
m_alarmEnabled = qAlarmEnabled.toBool();
m_alarmIsModal = qAlarmIsModal.toBool();
m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
setUpDesktopOverlay();
setUpDesktopOverlay( qDesktopWidth.toFloat() );
}
void UtilitiesTabController::initStage2( OverlayController* var_parent,
@@ -544,7 +546,7 @@ void UtilitiesTabController::eventLoopTick()
}
}
void UtilitiesTabController::setUpDesktopOverlay()
void UtilitiesTabController::setUpDesktopOverlay( float desktopWidthInMeters )
{
vr::VROverlayHandle_t pOverlayHandle = 0;
auto error = vr::VROverlay()->FindOverlay( steamDesktopOverlaykey,
@@ -555,21 +557,25 @@ void UtilitiesTabController::setUpDesktopOverlay()
LOG( INFO ) << "Could not find overlay \"" << steamDesktopOverlaykey
<< "\": "
<< vr::VROverlay()->GetOverlayErrorNameFromEnum( error );
return;
std::this_thread::sleep_for( std::chrono::seconds( 2 ) );
error = vr::VROverlay()->FindOverlay( steamDesktopOverlaykey,
&pOverlayHandle );
if ( error != vr::VROverlayError_None )
{
LOG( INFO ) << "Could not find overlay \"" << steamDesktopOverlaykey
<< "\" after waiting: "
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
error );
return;
}
LOG( INFO ) << "Found overlay \"" << steamDesktopOverlaykey
<< "\" after waiting.";
}
m_steamDesktopOverlayAvailable = true;
float width;
error = vr::VROverlay()->GetOverlayWidthInMeters( pOverlayHandle, &width );
if ( error != vr::VROverlayError_None )
{
LOG( ERROR ) << "Could not read overlay width of \""
<< steamDesktopOverlaykey << "\": "
<< vr::VROverlay()->GetOverlayErrorNameFromEnum( error );
return;
}
m_steamDesktopOverlayWidth = width;
setSteamDesktopOverlayWidth( desktopWidthInMeters, true, true );
}
bool UtilitiesTabController::steamDesktopOverlayAvailable() const
@@ -589,6 +595,12 @@ void UtilitiesTabController::setSteamDesktopOverlayWidth( float width,
if ( std::abs( m_steamDesktopOverlayWidth - width ) > 0.01f )
{
m_steamDesktopOverlayWidth = width;
auto settings = OverlayController::appSettings();
settings->beginGroup( "utilitiesSettings" );
settings->setValue( "desktopWidth", m_steamDesktopOverlayWidth );
settings->endGroup();
if ( notifyOpenVr )
{
vr::VROverlayHandle_t pOverlayHandle;