Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure more QML text components are rendering things as plain text #5231

Merged
merged 1 commit into from
Dec 1, 2022
Merged

Ensure more QML text components are rendering things as plain text #5231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/gui/tray/UnifiedSearchResultItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ RowLayout {
id: unifiedSearchResultTitleText
Layout.fillWidth: true
text: unifiedSearchResultItemDetails.title.replace(/[\r\n]+/g, " ")
textFormat: Text.PlainText
elide: Text.ElideRight
font.pixelSize: unifiedSearchResultItemDetails.titleFontSize
color: unifiedSearchResultItemDetails.titleColor
Expand All @@ -98,6 +99,7 @@ RowLayout {
id: unifiedSearchResultTextSubline
Layout.fillWidth: true
text: unifiedSearchResultItemDetails.subline.replace(/[\r\n]+/g, " ")
textFormat: Text.PlainText
elide: Text.ElideRight
font.pixelSize: unifiedSearchResultItemDetails.sublineFontSize
color: unifiedSearchResultItemDetails.sublineColor
Expand Down
1 change: 1 addition & 0 deletions src/gui/tray/UnifiedSearchResultNothingFound.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ColumnLayout {
Label {
id: unifiedSearchResultsNoResultsLabelDetails
text: unifiedSearchResultNothingFoundContainer.text
textFormat: Text.PlainText
color: Style.ncTextColor
font.pixelSize: Style.topLinePixelSize * 1.25
wrapMode: Text.Wrap
Expand Down
1 change: 1 addition & 0 deletions src/gui/tray/UnifiedSearchResultSectionItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Label {
leftPadding: Style.unifiedSearchResultSectionItemLeftPadding

text: section
textFormat: Text.PlainText
font.pixelSize: Style.unifiedSearchResultTitleFontSize
color: UserModel.currentUser.accentColor

Expand Down
4 changes: 4 additions & 0 deletions src/gui/tray/UserLine.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ AbstractButton {
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
verticalAlignment: Text.AlignBottom
text: name
textFormat: Text.PlainText
elide: Text.ElideRight
color: Style.ncTextColor
font.pixelSize: Style.topLinePixelSize
Expand All @@ -95,6 +96,7 @@ AbstractButton {
id: emoji
visible: model.statusEmoji !== ""
text: statusEmoji
textFormat: Text.PlainText
topPadding: -Style.accountLabelsSpacing
}

Expand All @@ -103,6 +105,7 @@ AbstractButton {
Layout.fillWidth: true
visible: model.statusMessage !== ""
text: statusMessage
textFormat: Text.PlainText
elide: Text.ElideRight
color: Style.ncTextColor
font.pixelSize: Style.subLinePixelSize
Expand All @@ -116,6 +119,7 @@ AbstractButton {
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
verticalAlignment: Text.AlignTop
text: server
textFormat: Text.PlainText
elide: Text.ElideRight
color: Style.ncTextColor
font.pixelSize: Style.subLinePixelSize
Expand Down