Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #16238 from RebeccaStankus/fullSizeWindow

Browse source 
Prereq work for 'Reduce User Friction'
This commit is contained in:
Shannon Romano 2019-09-24 10:58:39 -07:00 committed by GitHub
commit b491d00c00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -40,6 +40,9 @@ Rectangle {
property bool inventoryFullyReceived: false property bool inventoryFullyReceived: false
Component.onCompleted: { Component.onCompleted: {
var numTimesRun = Settings.getValue("simplifiedUI/SUIScriptExecutionCount", 0);
numTimesRun++;
Settings.setValue("simplifiedUI/SUIScriptExecutionCount", numTimesRun);
Commerce.getLoginStatus(); Commerce.getLoginStatus();
} }
@ -52,7 +55,7 @@ Rectangle {
if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) && if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&
topBarInventoryModel.count > 0) { topBarInventoryModel.count > 0) {
Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true); Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url; MyAvatar.useFullAvatarURL = topBarInventoryModel.get(0).download_url;
} }
} }
} }

7
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -532,6 +532,11 @@ function onGeometryChanged(rect) {
} }
} }
function onWindowMinimizedChanged() {
// prerequisite placeholder for Reduce Friction of Customer Acquisition sub task: https://highfidelity.atlassian.net/browse/DEV-585
print("WINDOW MINIMIZED CHANGED SIGNAL");
}
function onDisplayModeChanged(isHMDMode) { function onDisplayModeChanged(isHMDMode) {
if (isHMDMode) { if (isHMDMode) {
Camera.setModeString("first person"); Camera.setModeString("first person");
@ -612,6 +617,7 @@ function startup() {
Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged); Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged);
Audio.mutedHMDChanged.connect(onHMDInputDeviceMutedChanged); Audio.mutedHMDChanged.connect(onHMDInputDeviceMutedChanged);
Window.geometryChanged.connect(onGeometryChanged); Window.geometryChanged.connect(onGeometryChanged);
Window.minimizedChanged.connect(onWindowMinimizedChanged);
HMD.displayModeChanged.connect(onDisplayModeChanged); HMD.displayModeChanged.connect(onDisplayModeChanged);
Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
@ -657,6 +663,7 @@ function shutdown() {
Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged); Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged);
Audio.mutedHMDChanged.disconnect(onHMDInputDeviceMutedChanged); Audio.mutedHMDChanged.disconnect(onHMDInputDeviceMutedChanged);
Window.geometryChanged.disconnect(onGeometryChanged); Window.geometryChanged.disconnect(onGeometryChanged);
Window.minimizedChanged.disconnect(onWindowMinimizedChanged);
HMD.displayModeChanged.disconnect(onDisplayModeChanged); HMD.displayModeChanged.disconnect(onDisplayModeChanged);
Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);