X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=649b7618068cbb74d3fa351c3048eae12638504e;hb=517fc0fdbbd67b4e195b7a06246ff81a963a37fa;hp=ed931bd3eea4df4c0b7765932ca54c7e8d1d0671;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a;p=quassel.git diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index ed931bd3..649b7618 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -215,15 +215,15 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, const QAbstractItemModel *model_ = model(); QModelIndex myIdx = model_->index(row(), 0); Message::Type type = (Message::Type)myIdx.data(MessageModel::TypeRole).toInt(); - UiStyle::MessageLabel label = (UiStyle::MessageLabel)myIdx.data(ChatLineModel::MsgLabelRole).toInt(); + UiStyle::MessageLabel label = myIdx.data(ChatLineModel::MsgLabelRole).value(); - QTextCharFormat msgFmt = QtUi::style()->format(UiStyle::formatType(type), label); + QTextCharFormat msgFmt = QtUi::style()->format({UiStyle::formatType(type), {}, {}}, label); if (msgFmt.hasProperty(QTextFormat::BackgroundBrush)) { painter->fillRect(boundingRect(), msgFmt.background()); } if (_selection & Selected) { - QTextCharFormat selFmt = QtUi::style()->format(UiStyle::formatType(type), label | UiStyle::Selected); + QTextCharFormat selFmt = QtUi::style()->format({UiStyle::formatType(type), {}, {}}, label | UiStyle::MessageLabel::Selected); if (selFmt.hasProperty(QTextFormat::BackgroundBrush)) { qreal left = item((ChatLineModel::ColumnType)(_selection & ItemMask))->pos().x(); QRectF selectRect(left, 0, width() - left, height());