diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 2260bc312a..c74a01f31d 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -138,7 +138,6 @@ Flickable { labelTextOn: "Show Emote UI" checked: Settings.getValue("simplifiedUI/showEmoteUI", true) onClicked: { - console.log("CLICKED GENERAL SETTING") var currentSetting = Settings.getValue("simplifiedUI/showEmoteUI", true); Settings.setValue("simplifiedUI/showEmoteUI", !currentSetting); } diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js index 6697807b67..ab2cef7cb2 100644 --- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js +++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js @@ -530,16 +530,6 @@ function handleEmoteIndicatorVisibleChanged(shouldBeVisible) { } } -function handleEmoteIndictaorTrayDisabledChanged(shouldBeDisabled) { - emoteAppBarWindow.sendToQml({ - "source": "simplifiedEmote.js", - "method": "updateTrayDisabled", - "data": { - "shouldBeDisabled": shouldBeDisabled - } - }); -} - function onDisplayModeChanged(isHMDMode) { reactionsBegun.forEach(function(react) { diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml index b178b9eef5..b8b983c19c 100644 --- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml +++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml @@ -21,13 +21,9 @@ Rectangle { id: root color: simplifiedUI.colors.white anchors.fill: parent - Component.onCompleted: { - console.log("\n\n\n\n\n\n\n COMPLETED @@2 \n\n\n\n\n\n\n\n"); - } property int originalWidth: 48 property int expandedWidth: mainEmojiContainer.width + drawerContainer.width // For the below to work, the Repeater's Item's second child must be the individual button's `MouseArea` - // Here property int requestedWidth: ( root.showEmoteUI && ( drawerContainer.keepDrawerExpanded || @@ -46,8 +42,6 @@ Rectangle { onRequestedWidthChanged: { - console.log("root.tryDisabled on requested widthChanged", root.showEmoteUI); - console.log(root.requestedWidth); root.requestNewWidth(root.requestedWidth); } @@ -60,9 +54,7 @@ Rectangle { target: Settings onValueChanged: { - console.log("in on value changed", setting, value) if (setting === "simplifiedUI/showEmoteUI") { - console.log("on root tray disabled"); root.showEmoteUI = value; } }