projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move "Appearance" to "Interface" in settingspages
[quassel.git]
/
src
/
uisupport
/
uistyle.cpp
diff --git
a/src/uisupport/uistyle.cpp
b/src/uisupport/uistyle.cpp
index
0ebdf06
..
75524db
100644
(file)
--- 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());
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();
_listItemFormats = parser.listItemFormats();
styleSheet = styleSheet.trimmed();
@@
-457,10
+452,10
@@
UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat
color &= 0x0f;
if(s[pos+3] == 'f') {
curfmt &= 0xf0ffffff;
color &= 0x0f;
if(s[pos+3] == 'f') {
curfmt &= 0xf0ffffff;
- curfmt |= (color << 24) | 0x00400000;
+ curfmt |= (
quint32)(
color << 24) | 0x00400000;
} else {
curfmt &= 0x0fffffff;
} else {
curfmt &= 0x0fffffff;
- curfmt |= (color << 28) | 0x00800000;
+ curfmt |= (
quint32)(
color << 28) | 0x00800000;
}
length = 6;
}
}
length = 6;
}