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

only show Audio menu title when appropriate

Browse source
This commit is contained in:
Zach Pomerantz 2017-06-13 17:13:39 -04:00
parent 20c0dac8e8
commit e7da007acd
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -31,11 +31,27 @@ Rectangle {
color: hifi.colors.baseGray; color: hifi.colors.baseGray;
// only show the title if loaded through a "loader"
function showTitle() {
return audio.parent.objectName == "loader";
}
Column { Column {
y: 16 // padding does not work y: 16 // padding does not work
spacing: 16 spacing: 16
width: parent.width width: parent.width
RalewayRegular {
x: 16 // padding does not work
size: 16
color: "white"
text: audio.title
visible: audio.showTitle()
}
Separator { visible: audio.showTitle() }
Grid { Grid {
columns: 2 columns: 2
x: 16 // padding does not work x: 16 // padding does not work

2
scripts/system/audio.js
View file

@ -46,7 +46,7 @@ function onClicked() {
Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) }); Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
shouldActivateButton = true; shouldActivateButton = true;
shouldActivateButton = true; shouldActivateButton = true;
tablet.loadQMLSource("../dialogs/Audio.qml"); tablet.loadQMLSource("../audio/Audio.qml");
onAudioScreen = true; onAudioScreen = true;
} }
} }