Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-24 14:23:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2676 from csoler/v0.6-BugFixing_20

Browse Source 
re-created PR 2382 (#Phenom) to match new layout based on submodules
This commit is contained in:
csoler 2023-01-29 20:56:32 +01:00 committed by GitHub
commit 9442d87644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -1535,23 +1535,43 @@ void ChatWidget::chooseFont()
//Use NULL as parent as with this QFontDialog don't take care of title nether options.
QFont font = misc::getFont(&ok, currentFont, nullptr, tr("Choose your font."));
QTextCursor cursor = ui->chatTextEdit->textCursor();
if (ok) {
QTextCursor cursor = ui->chatTextEdit->textCursor();
if (cursor.selection().isEmpty()){
currentFont = font;
setFont();
} else {
//Merge Format doesn't works for only selection so add a new block.
QString text = "<p style=\"";
text += " color: " + currentColor.name() + ";";
text += " font-family:" + font.family() + ";";
text += font.bold() ? " font-weight: bold;" : "";
text += font.italic() ? " font-style: italic;" : "";
text += " font-size:" + QString::number(font.pointSize()) + "pt;";
text += font.strikeOut() ? " text-decoration: line-through;" : "";
text += font.underline() ? " text-decoration: underline;" : "";
text += "\">" + cursor.selectedText().toHtmlEscaped() + "</p>";
cursor.insertHtml(text);
// Merge Format doesn't works for only selection.
// and charFormat() get format for last char.
QTextCursor selCurs = cursor;
QTextCursor lastCurs = cursor;
int pos = cursor.selectionStart();
lastCurs.setPosition(pos);
do
{
// Get format block in selection iterating char one by one
selCurs.setPosition(++pos);
if (selCurs.charFormat() != lastCurs.charFormat())
{
// New char format, format last block.
QTextCharFormat charFormat = lastCurs.charFormat();
charFormat.setFont(font);
lastCurs.setCharFormat(charFormat);
// Last block formated, start it to current char.
lastCurs.setPosition(pos-1);
}
// Add current char.
lastCurs.setPosition(pos, QTextCursor::KeepAnchor);
} while (pos < cursor.selectionEnd());
// Now format last block
if (lastCurs.selectionStart() != lastCurs.selectionEnd())
{
QTextCharFormat charFormat = lastCurs.charFormat();
charFormat.setFont(font);
lastCurs.setCharFormat(charFormat);
}
}
}
}