From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 12 Aug 2009 07:09:23 +0000 (+0200)
Subject: Don't merge all custom formats with the base format
X-Git-Tag: 0.5-rc1~72
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b79476414ab03a5b051b348d3c4876fc35a940da;hp=437ee0c0385050f908731848b60941586c7067ca

Don't merge all custom formats with the base format

This was needed at some point, but now it just screws up things. Should make
combinations (like "color and bold") work again properly.
---

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index f0c7e9fa..75524db8 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -102,14 +102,9 @@ void UiStyle::loadStyleSheet() {
     QssParser parser;
     parser.processStyleSheet(styleSheet);
     QApplication::setPalette(parser.palette());
-    _uiStylePalette = parser.uiStylePalette();
 
-    QTextCharFormat baseFmt = parser.formats().value(Base);
-    foreach(quint64 fmtType, parser.formats().keys()) {
-      QTextCharFormat fmt = baseFmt;
-      fmt.merge(parser.formats().value(fmtType));
-      _formats[fmtType] = fmt;
-    }
+    _uiStylePalette = parser.uiStylePalette();
+    _formats = parser.formats();
     _listItemFormats = parser.listItemFormats();
 
     styleSheet = styleSheet.trimmed();