Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 06:02:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable rich text on message field and span tag when emoji is inserted

Browse source
This commit is contained in:
Angela Mazzurco 2017-07-01 17:13:44 +02:00
parent b38c944484
commit 6ea85de4ba
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
retroshare-qml-app/src/ChatView.qml
View file

@ -224,7 +224,6 @@ Item
focus: true focus: true
inputMethodHints: Qt.ImhMultiLine inputMethodHints: Qt.ImhMultiLine
textFormat: TextEdit.RichText
onTextChanged: onTextChanged:
{ {

4
retroshare-qml-app/src/components/emoji/EmojiPicker.qml
View file

@ -27,10 +27,10 @@ Rectangle {
if (plainText.length > 0) { if (plainText.length > 0) {
var lastChar = plainText[plainText.length-1] var lastChar = plainText[plainText.length-1]
if ((lastChar !== ' ') && (lastChar.charCodeAt(0) < 255)) { if ((lastChar !== ' ') && (lastChar.charCodeAt(0) < 255)) {
strAppnd = "&nbsp;" strAppnd = " "
} }
} }
strAppnd += '<span style="font-size: 22px">' + selectedEmoji + '</span>' strAppnd += selectedEmoji
textArea.insert(textArea.cursorPosition, strAppnd) textArea.insert(textArea.cursorPosition, strAppnd)
} }