d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 09:30:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use a better spoiler display method

Browse source 
I've taken this method from how Neochat implements spoilers. The
only downside is that all spoilers are displayed and hidden at the
same time; however, it solves the mobile problem.
This commit is contained in:
Loren Burkholder 2024-01-17 08:25:07 -05:00
parent 8ca0f61cad
commit c7e1c554bb
No known key found for this signature in database
GPG key ID: AB62CB312CEC2BBC
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/delegates/TextMessage.qml
View file

@ -2,6 +2,7 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick
import ".." import ".."
import im.nheko import im.nheko
@ -15,6 +16,7 @@ MatrixText {
property string copyText: selectedText ? getText(selectionStart, selectionEnd) : body property string copyText: selectedText ? getText(selectionStart, selectionEnd) : body
property int metadataWidth: 100 property int metadataWidth: 100
property bool fitsMetadata: false //positionAt(width,height-4) == positionAt(width-metadataWidth-10, height-4) property bool fitsMetadata: false //positionAt(width,height-4) == positionAt(width-metadataWidth-10, height-4)
property bool showSpoilers: false
// table border-collapse doesn't seem to work // table border-collapse doesn't seem to work
text: ` text: `
@ -33,11 +35,12 @@ MatrixText {
padding: ` + Math.ceil(fontMetrics.lineSpacing/2) + `px; padding: ` + Math.ceil(fontMetrics.lineSpacing/2) + `px;
} }
blockquote { margin-left: 1em; } blockquote { margin-left: 1em; }
` + (!Settings.mobileMode ? `span[data-mx-spoiler] { span[data-mx-spoiler] {` + (!showSpoilers ? `
color: transparent; color: transparent;
background-color: ` + palette.text + `; background-color: ` + palette.text + `;` : `
}` : "") + // TODO(Nico): Figure out how to support mobile background-color: ` + palette.alternateBase + ';') + `
`</style> }
</style>
` + formatted.replace(/<del>/g, "<s>").replace(/<\/del>/g, "</s>").replace(/<strike>/g, "<s>").replace(/<\/strike>/g, "</s>") ` + formatted.replace(/<del>/g, "<s>").replace(/<\/del>/g, "</s>").replace(/<strike>/g, "<s>").replace(/<\/strike>/g, "</s>")
enabled: !isReply enabled: !isReply
@ -49,4 +52,7 @@ MatrixText {
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
} }
TapHandler {
onTapped: showSpoilers = !showSpoilers
}
} }