Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix copying multi-line selected rich text

Browse Source 
For rich text (rendered HTML) fields and areas, the selectedText
property for some reason contains "\u2028" or "\u2029"
characters that look like newlines in Qt programs but are just
invisible anywhere else. Translate them to normal "\n".
This commit is contained in:
miruka 2020-10-31 02:59:56 -04:00
parent da75568428
commit 7564b40c3e
7 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/Base/HSelectableLabel.qml
View File

@ -9,6 +9,11 @@ TextEdit {
property bool enableLinkActivation: true
// For rich text, selectedText returns some weird invisible characters
// instead of real newlines
readonly property string selectedPlainText:
selectedText.replace(/[\u2028\u2029]/g, "\n")
function selectWordAt(position) {
label.cursorPosition = positionAt(position.x, position.y)
label.selectWord()

5
src/gui/Base/HTextArea.qml
View File

@ -30,6 +30,11 @@ TextArea {
property string previousDefaultText: "" // private
// For rich text, selectedText returns some weird invisible characters
// instead of real newlines
readonly property string selectedPlainText:
selectedText.replace(/[\u2028\u2029]/g, "\n")
property bool enableCustomImagePaste: false
signal customImagePaste()

4
src/gui/Base/HTextContextMenu.qml
View File

@ -50,14 +50,14 @@ HMenu {
HMenuItem {
icon.name: "cut-text"
text: qsTr("Cut")
enabled: control.selectedText
enabled: control.selectedPlainText
onTriggered: control.cut()
}
HMenuItem {
icon.name: "copy-text"
text: qsTr("Copy")
enabled: control.selectedText
enabled: control.selectedPlainText
onTriggered: control.copy()
}

5
src/gui/Base/HTextField.qml
View File

@ -30,6 +30,11 @@ TextField {
property string previousDefaultText: "" // private
// For rich text, selectedText returns some weird invisible characters
// instead of real newlines
readonly property string selectedPlainText:
selectedText.replace(/[\u2028\u2029]/g, "\n")
function reset() {
clear()
text = Qt.binding(() => defaultText || "")

8
src/gui/DebugConsole.qml
View File

@ -208,9 +208,9 @@ HDrawer {
Layout.fillWidth: true
onSelectedTextChanged: if (selectedText) {
onSelectedTextChanged: if (selectedPlainText) {
selectedOutputDelegateIndex = model.index
selectedOutputText = selectedText
selectedOutputText = selectedPlainText
} else if (selectedOutputDelegateIndex === model.index) {
selectedOutputDelegateIndex = -1
selectedOutputText = ""
@ -249,7 +249,7 @@ HDrawer {
icon.name: "copy-text"
text: qsTr("Copy")
onTriggered: {
if (delegate.selectedText) {
if (delegate.selectedPlainText) {
delegate.copy()
return
}
@ -337,7 +337,7 @@ HDrawer {
Keys.onPressed: ev => {
if (
ev.matches(StandardKey.Copy) &&
! inputArea.selectedText &&
! inputArea.selectedPlainText &&
selectedOutputText
) {
ev.accepted = true

4
src/gui/Pages/Chat/Composer/MessageArea.qml
View File

@ -225,7 +225,7 @@ HTextArea {
if (ev.text && autoCompletionOpen) acceptAutoCompletion()
if (ev.matches(StandardKey.Copy) &&
! area.selectedText &&
! area.selectedPlainText &&
eventList &&
(eventList.selectedCount || eventList.currentIndex !== -1))
{
@ -237,7 +237,7 @@ HTextArea {
// FIXME: buggy
// if (ev.modifiers === Qt.NoModifier &&
// ev.key === Qt.Key_Backspace &&
// ! area.selectedText)
// ! area.selectedPlainText)
// {
// ev.accepted = true
// area.remove(

8
src/gui/Pages/Chat/Timeline/EventContent.qml
View File

@ -82,7 +82,7 @@ HRowLayout {
window.settings.maxMessageCharactersPerLine
)
readonly property alias selectedText: contentLabel.selectedText
readonly property alias selectedText: contentLabel.selectedPlainText
spacing: theme.chat.message.horizontalSpacing
@ -182,9 +182,9 @@ HRowLayout {
Layout.maximumWidth: eventContent.maxMessageWidth
Layout.fillWidth: true
onSelectedTextChanged: if (selectedText) {
onSelectedTextChanged: if (selectedPlainText) {
eventList.delegateWithSelectedText = model.id
eventList.selectedText = selectedText
eventList.selectedText = selectedPlainText
} else if (eventList.delegateWithSelectedText === model.id) {
eventList.delegateWithSelectedText = ""
eventList.selectedText = ""
@ -274,7 +274,7 @@ HRowLayout {
radius: theme.chat.message.radius
z: -100
color: eventDelegate.checked &&
! contentLabel.selectedText &&
! contentLabel.selectedPlainText &&
! mousePointHandler.active &&
! mouseShiftPointHandler.active ?
theme.chat.message.checkedBackground :