Skip to content
Snippets Groups Projects
Commit 719e3af4 authored by Aline Gondim Santos's avatar Aline Gondim Santos Committed by Sébastien Blin
Browse files

swarmdetailspanel: elide text when too long for text area

GitLab: #900
Change-Id: Icb161a60de9e09a7d9bcc0980f709bdc20a58b98
parent eae071a1
No related branches found
No related tags found
No related merge requests found
......@@ -167,9 +167,9 @@ Item {
verticalAlignment: Text.AlignBottom
borderColor: root.editIconColor
placeholderText: readOnly? root.placeholderText : ""
placeholderText: readOnly ? root.placeholderText : ""
wrapMode: readOnly? TextEdit.WrapAnywhere : TextEdit.NoWrap
wrapMode: readOnly ? TextEdit.WrapAnywhere : TextEdit.NoWrap
horizontalAlignment: !readOnly || text !== "" ? Qt.AlignLeft : Qt.AlignHCenter
onFocusChanged: function(focus) {
......@@ -183,10 +183,11 @@ Item {
lineEdit.forceActiveFocus()
}
}
onAccepted: {
editable = !editable
root.accepted()
root.editingFinished()
editable = !editable
focus = false
}
}
......
......@@ -72,7 +72,18 @@ Rectangle {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: JamiTheme.preferredFieldWidth
Layout.topMargin: 5
TextMetrics {
id: formattedTitle
font.pointSize: JamiTheme.titleFontSize
elide: !titleLine.editable ? Text.ElideRight : Text.ElideNone
elideWidth: titleLine.lineEdit.width - 25
text: CurrentConversation.title
}
wrapMode: Text.NoWrap
font.pointSize: JamiTheme.titleFontSize
horizontalAlignment: Text.AlignHCenter
......@@ -84,7 +95,7 @@ Rectangle {
fontSize: 20
borderColor: "transparent"
text: CurrentConversation.title
text: formattedTitle.elidedText
readOnly: !root.isAdmin
placeholderText: JamiStrings.swarmName
placeholderTextColor: {
......@@ -113,7 +124,6 @@ Rectangle {
ConversationsAdapter.updateConversationTitle(LRCInstance.selectedConvUid, text)
}
onSecondIcoClicked: {editable = !editable}
}
EditableLineEdit {
......@@ -133,7 +143,18 @@ Rectangle {
secondIco: editable ? JamiResources.close_black_24dp_svg : ""
borderColor: "transparent"
text: CurrentConversation.description
TextMetrics {
id: formattedDescription
font.pointSize: JamiTheme.titleFontSize
elide: !descriptionLine.editable ? Text.ElideRight : Text.ElideNone
elideWidth: descriptionLine.lineEdit.width - 25
text: CurrentConversation.description
}
wrapMode: Text.NoWrap
text: formattedDescription.elidedText
readOnly: !root.isAdmin
visible: root.isAdmin || text.length > 0
placeholderText: JamiStrings.addADescription
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment