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

Merge pull request #9509 from druiz17/tabletBug

Browse source 
removed more qml errors
This commit is contained in:
Seth Alves 2017-01-25 15:41:07 -08:00 committed by GitHub
commit 888d326783
2 changed files with 65 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/resources/qml/hifi/tablet/Tablet.qml
View file

@ -76,16 +76,6 @@ Item {
anchors.topMargin: 0 anchors.topMargin: 0
anchors.top: parent.top anchors.top: parent.top
Row {
id: rowAudio1
height: parent.height
anchors.topMargin: 0
anchors.top: parent.top
anchors.leftMargin: 30
anchors.left: parent.left
anchors.rightMargin: 30
anchors.right: parent.right
spacing: 5
Image { Image {
id: muteIcon id: muteIcon
@ -151,13 +141,12 @@ Item {
text: tablet.parent.parent.username text: tablet.parent.parent.username
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0 anchors.rightMargin: 20
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pixelSize: 20 font.pixelSize: 20
color: "#afafaf" color: "#afafaf"
} }
} }
}
Rectangle { Rectangle {
id: bgMain id: bgMain

2
interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
View file

@ -63,7 +63,9 @@ Item {
result.append({"name": item.title, "item": item}) result.append({"name": item.title, "item": item})
break; break;
case MenuItemType.Item: case MenuItemType.Item:
if (item.text !== "Users Online") {
result.append({"name": item.text, "item": item}) result.append({"name": item.text, "item": item})
}
break; break;
case MenuItemType.Separator: case MenuItemType.Separator:
result.append({"name": "", "item": item}) result.append({"name": "", "item": item})