Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:19:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Frequent checkpoints are good.

Browse source
This commit is contained in:
Zach Fox 2016-12-19 15:41:28 -08:00
parent e7c2229b2c
commit feafc16833
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/NameCard.qml
View file

@ -18,9 +18,9 @@ Row {
// Spacing // Spacing
spacing: 10; spacing: 10;
// Anchors // Anchors
//anchors.topMargin: 10; anchors.topMargin: 10;
anchors.leftMargin: 10; anchors.leftMargin: 10;
//anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter;
// Properties // Properties
property string displayName: ""; property string displayName: "";

4
interface/resources/qml/hifi/Pal.qml
View file

@ -109,6 +109,7 @@ Rectangle {
// This Rectangle refers to each Row in the table. // This Rectangle refers to each Row in the table.
rowDelegate: Rectangle { // The only way I know to specify a row height. rowDelegate: Rectangle { // The only way I know to specify a row height.
// Size
height: rowHeight; height: rowHeight;
// The rest of this is cargo-culted to restore the default styling // The rest of this is cargo-culted to restore the default styling
SystemPalette { SystemPalette {
@ -126,6 +127,9 @@ Rectangle {
id: itemCell; id: itemCell;
property bool isCheckBox: typeof(styleData.value) === 'boolean'; property bool isCheckBox: typeof(styleData.value) === 'boolean';
property bool isSeparator: styleData.value === ''; property bool isSeparator: styleData.value === '';
// Anchors
anchors.topMargin: 10;
anchors.bottomMargin: anchors.topMargin;
// This NameCard refers to the cell that contains an avatar's // This NameCard refers to the cell that contains an avatar's
// DisplayName and UserName // DisplayName and UserName
NameCard { NameCard {

2
scripts/system/pal.js
View file

@ -145,7 +145,7 @@ function usernameFromIDReply(id, username, machineFingerprint) {
data = ['', username] data = ['', username]
} else { } else {
// Set the data to contain the ID and the username+ID concat string. // Set the data to contain the ID and the username+ID concat string.
data = [id, username + '/' + machineFingerprint]; data = [id, username || machineFingerprint];
} }
print('Username Data:', JSON.stringify(data)); print('Username Data:', JSON.stringify(data));
// Ship the data off to QML // Ship the data off to QML