Merge pull request #924 from tastytea/wrap-room-name

Allow room name in room settings to wrap
pull/928/head
DeepBlueV7.X 3 years ago committed by GitHub
commit 19e2527b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      resources/qml/dialogs/RoomSettings.qml
  2. 6
      resources/qml/dialogs/UserProfile.qml

@ -100,7 +100,8 @@ ApplicationWindow {
MatrixText {
text: roomSettings.roomName
font.pixelSize: fontMetrics.font.pixelSize * 2
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
horizontalAlignment: TextEdit.AlignHCenter
}
MatrixText {

@ -138,6 +138,9 @@ ApplicationWindow {
color: TimelineManager.userColor(profile.userid, Nheko.colors.window)
font.bold: true
Layout.alignment: Qt.AlignHCenter
Layout.maximumWidth: parent.width - (Nheko.paddingSmall * 2) - usernameChangeButton.anchors.leftMargin - (usernameChangeButton.width * 2)
horizontalAlignment: TextInput.AlignHCenter
wrapMode: TextInput.Wrap
selectByMouse: true
onAccepted: {
profile.changeUsername(displayUsername.text);
@ -145,6 +148,7 @@ ApplicationWindow {
}
ImageButton {
id: usernameChangeButton
visible: profile.isSelf
anchors.leftMargin: Nheko.paddingSmall
anchors.left: displayUsername.right
@ -183,6 +187,8 @@ ApplicationWindow {
text: qsTr("Room: %1").arg(profile.room ? profile.room.roomName : "")
ToolTip.text: qsTr("This is a room-specific profile. The user's name and avatar may be different from their global versions.")
ToolTip.visible: ma.hovered
Layout.maximumWidth: parent.parent.width - (parent.spacing * 3) - 16
horizontalAlignment: TextEdit.AlignHCenter
HoverHandler {
id: ma

Loading…
Cancel
Save