History

Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2

Zach Fox committed 8 years ago

Commit 7be5d562 parents 9f91238 e40a021439 files · +5610 −4443Browse files

Showing the changes to interface/src/Application.cpp (1 of 439 files). Show all

Unified · Split

interface/src/Application.cpp+11−0
@@ -3537,6 +3537,7 @@ void Application::setIsInterstitialMode(bool interstitialMode) { · 3536 unmodified lines
35373537 if (enableInterstitial) {
35383538 if (_interstitialMode != interstitialMode) {
35393539 _interstitialMode = interstitialMode;
3540+ emit interstitialModeChanged(_interstitialMode);
35403541
35413542 DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);
35423543 DependencyManager::get<AvatarManager>()->setMyAvatarDataPacketsPaused(_interstitialMode);
@@ -8480,6 +8481,16 @@ QUuid Application::getTabletFrameID() const { · 4937 unmodified lines
84808481 return HMD->getCurrentTabletFrameID();
84818482 }
84828483
8484+QVector<QUuid> Application::getTabletIDs() const {
8485+ // Most important overlays first.
8486+ QVector<QUuid> result;
8487+ auto HMD = DependencyManager::get<HMDScriptingInterface>();
8488+ result << HMD->getCurrentTabletScreenID();
8489+ result << HMD->getCurrentHomeButtonID();
8490+ result << HMD->getCurrentTabletFrameID();
8491+ return result;
8492+}
8493+
84838494 void Application::setAvatarOverrideUrl(const QUrl& url, bool save) {
84848495 _avatarOverrideUrl = url;
84858496 _saveAvatarOverrideUrl = save;