From: Marcus Eggenberger Date: Tue, 30 Sep 2008 12:25:40 +0000 (+0200) Subject: new message line no longer grows with the item height X-Git-Tag: 0.3.1~217 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e178f81f44f5e305315f7755ca404c2a5f992711 new message line no longer grows with the item height --- diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp index 7633f827..41701c32 100644 --- a/src/client/messagemodel.cpp +++ b/src/client/messagemodel.cpp @@ -37,7 +37,6 @@ MessageModel::MessageModel(QObject *parent) _nextDayChange.setTimeSpec(Qt::UTC); _nextDayChange.setTime_t(((now.toTime_t() / 86400) + 1) * 86400); _nextDayChange.setTimeSpec(Qt::LocalTime); - qDebug() << _nextDayChange; _dayChangeTimer.setInterval(QDateTime::currentDateTime().secsTo(_nextDayChange) * 1000); _dayChangeTimer.start(); connect(&_dayChangeTimer, SIGNAL(timeout()), this, SLOT(changeOfDay())); diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h index c2cb4ee4..b8b6e145 100644 --- a/src/qtui/chatitem.h +++ b/src/qtui/chatitem.h @@ -146,6 +146,7 @@ public: ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent); inline ChatLineModel::ColumnType column() const { return ChatLineModel::ContentsColumn; } + inline QFontMetricsF *fontMetrics() const { return _fontMetrics; } protected: virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); @@ -177,7 +178,6 @@ private: friend class ChatLine; friend struct ContentsChatItemPrivate; - inline QFontMetricsF *fontMetrics() const { return _fontMetrics; } QFontMetricsF *_fontMetrics; }; diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index 14c782f5..00220bb9 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -152,7 +152,7 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value(); if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) { QtUiStyleSettings s("Colors"); - QLinearGradient gradient(0, 0, 0, height()); + QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing()); gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value()); gradient.setColorAt(0.1, Qt::transparent); painter->fillRect(boundingRect(), gradient);