tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix inactive "Send Arrow" in smsapp after first message sent

Browse source 
The "enabled" property of the button was set to false and has overwritten the default value based on the message length.
The message field had "anchors.fill" positioning and raised  "Binding loop detected for property "implicitHeight"" error.
attachmentList property of ChatMessage didn't have the default value and was undefined.

BUG: 455149
This commit is contained in:
Dmytrii Zavalnyi 2023-04-21 16:28:58 +00:00 committed by Simon Redman
parent ccb4a62f9c
commit 0d02a6f99e
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smsapp/qml/ChatMessage.qml
View file

@ -21,7 +21,7 @@ Item {
property date dateTime property date dateTime
property string name property string name
property bool multiTarget property bool multiTarget
property var attachmentList property var attachmentList: []
signal messageCopyRequested(string message) signal messageCopyRequested(string message)

23
smsapp/qml/SendingArea.qml
View file

@ -68,7 +68,7 @@ ColumnLayout {
Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
Controls.TextArea { Controls.TextArea {
anchors.fill: parent width: parent.width
id: messageField id: messageField
placeholderText: i18nd("kdeconnect-sms", "Compose message") placeholderText: i18nd("kdeconnect-sms", "Compose message")
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
@ -144,15 +144,14 @@ ColumnLayout {
onClicked: { onClicked: {
selectedFileUrls = [] selectedFileUrls = []
if (messageField.text == "") {
sendButton.enabled = false
}
} }
} }
Controls.ToolButton { Controls.ToolButton {
property bool isSendingInProcess: false
id: sendButton id: sendButton
enabled: messageField.text.length || selectedFileUrls.length enabled: (messageField.text.length || selectedFileUrls.length) && !isSendingInProcess
Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredWidth: Kirigami.Units.gridUnit * 2
Layout.preferredHeight: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2
padding: 0 padding: 0
@ -169,9 +168,13 @@ ColumnLayout {
property bool messageSent: false property bool messageSent: false
onClicked: { onClicked: {
// disable the button to prevent sending
// the same message several times // prevent sending the same message several times
sendButton.enabled = false // and don't touch enabled property
if (isSendingInProcess){
return;
}
isSendingInProcess = true
if (SmsHelper.totalMessageSize(selectedFileUrls, messageField.text) > maxMessageSize) { if (SmsHelper.totalMessageSize(selectedFileUrls, messageField.text) > maxMessageSize) {
messageDialog.visible = true messageDialog.visible = true
@ -184,14 +187,14 @@ ColumnLayout {
if (messageSent) { if (messageSent) {
messageField.text = "" messageField.text = ""
selectedFileUrls = [] selectedFileUrls = []
sendButton.enabled = false
} }
isSendingInProcess = false
} }
} }
} }
Controls.Label { Controls.Label {
id: "charCount" id: charCount
text: conversationModel.getCharCountInfo(messageField.text) text: conversationModel.getCharCountInfo(messageField.text)
visible: text.length > 0 visible: text.length > 0
Layout.minimumWidth: Math.max(Layout.minimumWidth, width) // Make this label only grow, never shrink Layout.minimumWidth: Math.max(Layout.minimumWidth, width) // Make this label only grow, never shrink