Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checkpoint

Browse source
This commit is contained in:
Zach Fox 2017-01-12 16:40:47 -08:00
parent 117e302b2a
commit 6e4a4da92a
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,17 +69,15 @@ Item {
id: myDisplayNameText
// Properties
text: thisNameCard.displayName
autoScroll: false
maximumLength: 64
width: parent.width
height: parent.height
wrapMode: TextInput.Wrap
clip: true
// Anchors
anchors.fill: parent
anchors.leftMargin: 10
anchors.rightMargin: editGlyph.implicitWidth + editGlyph.anchors.rightMargin
// Text Positioning
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
verticalAlignment: TextInput.AlignVCenter
horizontalAlignment: TextInput.AlignLeft
// Style
color: hifi.colors.darkGray
FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
@ -87,15 +85,18 @@ Item {
font.pointSize: thisNameCard.displayTextHeight
// Signals
onEditingFinished: {
console.log("New displayName: ", text)
pal.sendToScript({method: 'displayNameUpdate', params: text})
}
}
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
propagateComposedEvents: true
onClicked: {
myDisplayNameText.focus ? myDisplayNameText.cursorPosition = myDisplayNameText.positionAt(mouseX, mouseY, TextInput.CursorOnCharacter) : myDisplayNameText.selectAll();
myDisplayNameText.focus = true;
}
onDoubleClicked: {
myDisplayNameText.selectAll();
myDisplayNameText.focus = true;
}
@ -104,6 +105,7 @@ Item {
}
// Edit pencil glyph
HiFiGlyphs {
id: editGlyph
text: hifi.glyphs.edit
// Size
size: thisNameCard.displayTextHeight

6
scripts/system/pal.js
View file

@ -237,6 +237,12 @@ pal.fromQml.connect(function (message) { // messages are {method, params}, like
data = message.params;
Users.setAvatarGain(data['sessionId'], data['gain']);
break;
case 'displayNameUpdate':
if (MyAvatar.displayName != message.params) {
MyAvatar.displayName = message.params;
}
break;
default:
default:
print('Unrecognized message from Pal.qml:', JSON.stringify(message));
}