From b79476414ab03a5b051b348d3c4876fc35a940da Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 12 Aug 2009 09:09:23 +0200 Subject: [PATCH] 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. --- src/uisupport/uistyle.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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(); -- 2.20.1