Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite of Underline Fix PR#2109

Browse Source
This commit is contained in:
Phenom 2020-11-12 16:47:13 +01:00
parent 4a7906376f
commit c354d90c1b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -1034,9 +1034,10 @@ static void styleCreate(QDomDocument& doc
it.next(); it.next();
const QStringList& classUsingIt ( it.value()) ; const QStringList& classUsingIt ( it.value()) ;
bool first = true; bool first = true;
QString classNames = "";
foreach(QString className, classUsingIt) { foreach(QString className, classUsingIt) {
if (!className.trimmed().isEmpty()) { if (!className.trimmed().isEmpty()) {
style += QString(first?".":",.") + className;// + " "; classNames += QString(first?".":",.") + className;// + " ";
first = false; first = false;
} }
} }
@ -1059,13 +1060,11 @@ static void styleCreate(QDomDocument& doc
(flag & RSHTML_FORMATTEXT_REMOVE_FONT_SIZE && key == "font-size") || (flag & RSHTML_FORMATTEXT_REMOVE_FONT_SIZE && key == "font-size") ||
(flag & RSHTML_FORMATTEXT_REMOVE_FONT_WEIGHT && key == "font-weight") || (flag & RSHTML_FORMATTEXT_REMOVE_FONT_WEIGHT && key == "font-weight") ||
(flag & RSHTML_FORMATTEXT_REMOVE_FONT_STYLE && key == "font-style")) { (flag & RSHTML_FORMATTEXT_REMOVE_FONT_STYLE && key == "font-style")) {
style += "{}";
continue; continue;
} }
if (flag & RSHTML_FORMATTEXT_REMOVE_COLOR) { if (flag & RSHTML_FORMATTEXT_REMOVE_COLOR) {
if (key == "color") { if (key == "color") {
style += "{}";
continue; continue;
} }
} else if (flag & RSHTML_FORMATTEXT_FIX_COLORS) { } else if (flag & RSHTML_FORMATTEXT_FIX_COLORS) {
@ -1080,15 +1079,14 @@ static void styleCreate(QDomDocument& doc
// it can become unreadable on the original background. // it can become unreadable on the original background.
// Also, FIX_COLORS is intended to display text on the default // Also, FIX_COLORS is intended to display text on the default
// background color of the operating system. // background color of the operating system.
style += "{}";
continue; continue;
} }
} }
//.S1 .S2 .S4 {font-family:'Sans';} //.S1 .S2 .S4 {font-family:'Sans';}
style += "{" + key + ":" + val + ";}"; style += classNames + "{" + key + ":" + val + ";}";
} else { } else {
style += "{" + it.key() + ";}\n"; style += classNames + "{" + it.key() + ";}\n";
} }
} }