X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=278c1de4676e628b3917ffb504ac6238599e5be4;hp=bac4991a719f215b4ac48460c2821d9627d8ecc9;hb=64d5732f4e6ce84dd73dfb1a72c1fbb568a3fe0a;hpb=b4f1d778d8ea3bf86ddf1764314132e5eb9ef296 diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index bac4991a..278c1de4 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -75,9 +75,6 @@ void ChatLine::setFirstColumn(const qreal ×tampWidth, const qreal &senderWi // senderItem doesn't need a geom change as it's Pos is changed (ensured by void ChatScene::firstHandlePositionChanged(qreal xpos)) _senderItem.setGeometry(senderWidth, _height); _senderItem.setPos(senderPos); - - _timestampItem.clearLayout(); - _senderItem.clearLayout(); } // NOTE: contentsPos is in ChatLines coordinate system! @@ -97,9 +94,6 @@ void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWi _contentsItem.setPos(contentsPos); - _timestampItem.clearLayout(); - _senderItem.clearLayout(); - if(needGeometryChange) prepareGeometryChange(); @@ -119,7 +113,6 @@ void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth } _timestampItem.setHeight(height); _senderItem.setHeight(height); - _contentsItem.clearLayout(); if(needGeometryChange) prepareGeometryChange(); @@ -181,7 +174,7 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, // don't show the marker if we wrote that new line if(!(flags & Message::Self)) { BufferId bufferId = BufferId(chatScene()->idString().toInt()); - MsgId lastSeenMsgId = Client::networkModel()->lastSeenMsgId(bufferId); + MsgId lastSeenMsgId = Client::networkModel()->lastSeenMarkerMsgId(bufferId); if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) { QtUiStyleSettings s("Colors"); QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing());