Bad... idea.
}
QFontMetricsF *ContentsChatItem::fontMetrics() const {
- return QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
+ return QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second, 0);
}
ContentsChatItem::~ContentsChatItem() {
UiStyle::StyledString styledContents = QtUi::style()->styleString(QtUi::style()->mircToInternal(text), UiStyle::PlainMsg);
plainText = styledContents.plainText;
- formatList = QtUi::style()->toTextLayoutList(styledContents.formatList, plainText.length());
+ formatList = QtUi::style()->toTextLayoutList(styledContents.formatList, plainText.length(), 0);
int height = 1;
foreach(QTextLayout::FormatRange fr, formatList) {
height = qMax(height, QFontMetrics(fr.format.font()).height());
foreach(quint64 fmtType, parser.formats().keys()) {
QTextCharFormat fmt = baseFmt;
fmt.merge(parser.formats().value(fmtType));
- _formatCache[fmtType] = fmt;
+ _formats[fmtType] = fmt;
}
_listItemFormats = parser.listItemFormats();
/******** Caching *******/
-QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
- return _formatCache.value(key, QTextCharFormat());
+QTextCharFormat UiStyle::format(quint64 key) const {
+ return _formats.value(key, QTextCharFormat());
}
QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel) const {
- return cachedFormat(formatType | ((quint64)messageLabel << 32));
+ return _formatCache.value(formatType | ((quint64)messageLabel << 32), QTextCharFormat());
}
void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) {
quint64 label = (quint64)label_ << 32;
// check if we have exactly this format readily cached already
- QTextCharFormat fmt = cachedFormat(label|ftype);
+ QTextCharFormat fmt = cachedFormat(ftype, label_);
if(fmt.properties().count())
return fmt;
// TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic"
// or "foreground 01 and background 03"
- if((ftype & 0xfff0)) { // element format
+ if((ftype & 0xfff00)) { // element format
for(quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
if(ftype & mask) {
mergeSubElementFormat(fmt, mask | 0xff, label);
// Merge a subelement format into an existing message format
void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint64 label) {
quint64 key = ftype | label;
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
+ fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement
+ fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
+ fmt.merge(format(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash
+ fmt.merge(format(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
}
UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
static QString mircToInternal(const QString &);
static inline QString timestampFormatString() { return _timestampFormatString; }
- QTextCharFormat format(quint32 formatType, quint32 messageLabel = 0);
- QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel = 0);
+ QTextCharFormat format(quint32 formatType, quint32 messageLabel);
+ QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel);
- QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel = 0);
+ QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel);
inline const QBrush &brush(ColorRole role) const { return _uiStylePalette.at((int) role); }
inline void setBrush(ColorRole role, const QBrush &brush) { _uiStylePalette[(int) role] = brush; }
void loadStyleSheet();
QString loadStyleSheet(const QString &name, bool shouldExist = false);
- QTextCharFormat cachedFormat(quint64 key) const;
- QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel = 0) const;
- void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel = 0);
+ QTextCharFormat format(quint64 key) const;
+ QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel) const;
+ void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel);
void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
private:
QVector<QBrush> _uiStylePalette;
QBrush _markerLineBrush;
+ QHash<quint64, QTextCharFormat> _formats;
QHash<quint64, QTextCharFormat> _formatCache;
QHash<quint64, QFontMetricsF *> _metricsCache;
QHash<quint32, QTextCharFormat> _listItemFormats;