Set WrapMode on all TextArea components, and fix up some of the Labels

Upstream styles do not provide any wrapping by default, and thus we
should not rely on deceptively convenient override in qqc2-desktop-style.

See https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/331
This commit is contained in:
ivan tkachenko
2023-11-28 04:07:19 +03:00
committed by Tobias Fella
parent 2980dc49e4
commit f3b021c964
5 changed files with 5 additions and 4 deletions

View File

@@ -187,7 +187,7 @@ QQC2.Control {
placeholderText: root.currentRoom.usesEncryption ? i18n("Send an encrypted message…") : root.currentRoom.mainCache.attachmentPath.length > 0 ? i18n("Set an attachment caption…") : i18n("Send a message…") placeholderText: root.currentRoom.usesEncryption ? i18n("Send an encrypted message…") : root.currentRoom.mainCache.attachmentPath.length > 0 ? i18n("Set an attachment caption…") : i18n("Send a message…")
verticalAlignment: TextEdit.AlignVCenter verticalAlignment: TextEdit.AlignVCenter
wrapMode: Text.Wrap wrapMode: TextEdit.Wrap
Accessible.description: placeholderText Accessible.description: placeholderText

View File

@@ -86,6 +86,7 @@ FormCard.FormCardPage {
id: roomTopicTextArea id: roomTopicTextArea
Accessible.description: roomTopicLabel.text Accessible.description: roomTopicLabel.text
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: TextEdit.Wrap
text: room.topic text: room.topic
readOnly: !room.canSendState("m.room.topic") readOnly: !room.canSendState("m.room.topic")
onTextChanged: roomTopicField.text = text onTextChanged: roomTopicField.text = text

View File

@@ -34,7 +34,7 @@ QQC2.TextArea {
color: Kirigami.Theme.textColor color: Kirigami.Theme.textColor
verticalAlignment: TextEdit.AlignVCenter verticalAlignment: TextEdit.AlignVCenter
wrapMode: Text.Wrap wrapMode: TextEdit.Wrap
onTextChanged: { onTextChanged: {
_private.chatBarCache.text = text _private.chatBarCache.text = text

View File

@@ -32,7 +32,7 @@ Kirigami.Page {
text: sourceText text: sourceText
readOnly: true readOnly: true
textFormat: TextEdit.PlainText textFormat: TextEdit.PlainText
wrapMode: Text.WordWrap wrapMode: TextEdit.Wrap
background: Rectangle { background: Rectangle {
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false Kirigami.Theme.inherit: false

View File

@@ -63,7 +63,7 @@ RowLayout {
selectByMouse: true selectByMouse: true
selectByKeyboard: true selectByKeyboard: true
readOnly: true readOnly: true
wrapMode: QQC2.Label.Wrap wrapMode: TextEdit.Wrap
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
background: Item {} background: Item {}
HoverHandler { HoverHandler {