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

updated setting name and changed default value to true for show tray

Browse source
This commit is contained in:
milad 2019-09-04 12:59:17 -07:00
parent 6c9c22a5fb
commit 5fdcf0ecaf
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -136,17 +136,17 @@ Flickable {
Layout.preferredHeight: 18 Layout.preferredHeight: 18
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
labelTextOn: "Show Emote UI" labelTextOn: "Show Emote UI"
checked: Settings.getValue("simplifiedUI/showEmoteUI", true) checked: Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true)
onClicked: { onClicked: {
var currentSetting = Settings.getValue("simplifiedUI/showEmoteUI", true); var currentSetting = Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true);
Settings.setValue("simplifiedUI/showEmoteUI", !currentSetting); Settings.setValue("simplifiedUI/allowEmoteDrawerExpansion", !currentSetting);
} }
Connections { Connections {
target: Settings target: Settings
onValueChanged: { onValueChanged: {
if (setting === "simplifiedUI/showEmoteUI") { if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
emoteSwitch.checked = value; emoteSwitch.checked = value;
} }
} }

10
scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
View file

@ -25,7 +25,7 @@ Rectangle {
property int expandedWidth: mainEmojiContainer.width + drawerContainer.width 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` // For the below to work, the Repeater's Item's second child must be the individual button's `MouseArea`
property int requestedWidth: ( property int requestedWidth: (
root.showEmoteUI && ( root.allowEmoteDrawerExpansion && (
drawerContainer.keepDrawerExpanded || drawerContainer.keepDrawerExpanded ||
emoteIndicatorMouseArea.containsMouse || emoteIndicatorMouseArea.containsMouse ||
emoteButtonsRepeater.itemAt(0).hovered || emoteButtonsRepeater.itemAt(0).hovered ||
@ -37,7 +37,7 @@ Rectangle {
) ? expandedWidth : originalWidth; ) ? expandedWidth : originalWidth;
readonly property int totalEmojiDurationMS: 7000 // Must match `TOTAL_EMOJI_DURATION_MS` in `simplifiedEmoji.js` readonly property int totalEmojiDurationMS: 7000 // Must match `TOTAL_EMOJI_DURATION_MS` in `simplifiedEmoji.js`
readonly property string emoteIconSource: "images/emote_Icon.svg" readonly property string emoteIconSource: "images/emote_Icon.svg"
property bool showEmoteUI: Settings.getValue("simplifiedUI/showEmoteUI", false) property bool allowEmoteDrawerExpansion: Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true)
onRequestedWidthChanged: { onRequestedWidthChanged: {
@ -53,8 +53,8 @@ Rectangle {
target: Settings target: Settings
onValueChanged: { onValueChanged: {
if (setting === "simplifiedUI/showEmoteUI") { if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
root.showEmoteUI = value; root.allowEmoteDrawerExpansion = value;
} }
} }
} }
@ -172,7 +172,7 @@ Rectangle {
anchors.fill: lockIcon anchors.fill: lockIcon
source: lockIcon source: lockIcon
color: "#ffffff" color: "#ffffff"
visible: root.showEmoteUI && drawerContainer.keepDrawerExpanded visible: root.allowEmoteDrawerExpansion && drawerContainer.keepDrawerExpanded
} }
MouseArea { MouseArea {