ChatMonitorSettingspage ported to 0.3.x

[quassel.git] / src / qtui / chatline.cpp

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index ce208be..6ccb9f7 100644 (file)
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -86,7 +86,7 @@ void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWi
   // contentsItem doesn't need a geom change as it's Pos is changed (ensured by void ChatScene::firstHandlePositionChanged(qreal xpos))
   qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
   linePos -= height;
-  bool needGeometryChange = linePos == pos().y() && height != _height;
+  bool needGeometryChange = linePos == pos().y();
 
   if(needGeometryChange) {
     _timestampItem.prepareGeometryChange();
@@ -97,8 +97,8 @@ void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWi
 
   _contentsItem.setPos(contentsPos);
 
-  _timestampItem.clearLayout();
   _senderItem.clearLayout();
+  _contentsItem.clearLayout();
 
   if(needGeometryChange)
     prepareGeometryChange();
@@ -181,7 +181,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());