summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/Highlighting/HighlightManager.cpp2
-rw-r--r--Swift/QtUI/QtWebKitChatView.cpp14
2 files changed, 7 insertions, 9 deletions
diff --git a/Swift/Controllers/Highlighting/HighlightManager.cpp b/Swift/Controllers/Highlighting/HighlightManager.cpp
index 89261af..2ca77e7 100644
--- a/Swift/Controllers/Highlighting/HighlightManager.cpp
+++ b/Swift/Controllers/Highlighting/HighlightManager.cpp
@@ -50,8 +50,6 @@ HighlightConfiguration HighlightManager::getDefaultConfig() {
HighlightConfiguration defaultConfiguration;
defaultConfiguration.playSoundOnIncomingDirectMessages = true;
defaultConfiguration.showNotificationOnIncomingDirectMessages = true;
- defaultConfiguration.ownMentionAction.setFrontColor(std::string("black"));
- defaultConfiguration.ownMentionAction.setBackColor(std::string("yellow"));
defaultConfiguration.ownMentionAction.setSoundFilePath(std::string("/sounds/message-received.wav"));
defaultConfiguration.ownMentionAction.setSystemNotificationEnabled(true);
return defaultConfiguration;
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 048fe99..4dd67f1 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -483,15 +483,15 @@ std::string QtWebKitChatView::addMessage(
}
QString QtWebKitChatView::getHighlightSpanStart(const std::string& text, const std::string& background) {
- QString ecsapeColor = QtUtilities::htmlEscape(P2QSTRING(text));
- QString escapeBackground = QtUtilities::htmlEscape(P2QSTRING(background));
- if (ecsapeColor.isEmpty()) {
- ecsapeColor = "black";
+ QString ecsapeColor;
+ QString escapeBackground;
+ if (!text.empty()) {
+ ecsapeColor = QString("color: %1").arg(QtUtilities::htmlEscape(P2QSTRING(text)));
}
- if (escapeBackground.isEmpty()) {
- escapeBackground = "yellow";
+ if (!background.empty()) {
+ escapeBackground = QString("background: %1").arg(QtUtilities::htmlEscape(P2QSTRING(background)));
}
- return QString("<span style=\"color: %1; background: %2\">").arg(ecsapeColor).arg(escapeBackground);
+ return QString("<span style=\"%1; %2;\">").arg(ecsapeColor).arg(escapeBackground);
}
QString QtWebKitChatView::getHighlightSpanStart(const HighlightAction& highlight) {