}
}
-// WARNING: setColumns should not be used without either:
-// a) calling prepareGeometryChange() immediately before setColumns()
-// b) calling Chatline::setPos() immediately afterwards
-//
-// NOTE: senderPos and contentsPos are in ChatLines coordinate system!
-qreal ChatLine::setColumns(const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth,
- const QPointF &senderPos, const QPointF &contentsPos) {
- _height = _contentsItem.setGeometryByWidth(contentsWidth);
- _senderItem.setGeometry(senderWidth, _height);
+// NOTE: senderPos is in ChatLines coordinate system!
+void ChatLine::setFirstColumn(const qreal ×tampWidth, const qreal &senderWidth, const QPointF &senderPos) {
+ _timestampItem.prepareGeometryChange();
_timestampItem.setGeometry(timestampWidth, _height);
-
+ // 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);
- _contentsItem.setPos(contentsPos);
- _contentsItem.clearLayout();
+ _timestampItem.clearLayout();
_senderItem.clearLayout();
+}
+
+// NOTE: contentsPos is in ChatLines coordinate system!
+void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWidth,
+ const QPointF &contentsPos, qreal &linePos) {
+ // 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();
+
+ if(needGeometryChange) {
+ _timestampItem.prepareGeometryChange();
+ _senderItem.prepareGeometryChange();
+ }
+ _timestampItem.setHeight(height);
+ _senderItem.setGeometry(senderWidth, height);
+
+ _contentsItem.setPos(contentsPos);
+
_timestampItem.clearLayout();
+ _senderItem.clearLayout();
+
+ if(needGeometryChange)
+ prepareGeometryChange();
- return _height;
+ _height = height;
+
+ setPos(0, linePos);
}
-// WARNING: setGeometryByWidth should not be used without either:
-// a) calling prepareGeometryChange() immediately before setColumns()
-// b) calling Chatline::setPos() immediately afterwards
-qreal ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth) {
- _width = width;
- _height = _contentsItem.setGeometryByWidth(contentsWidth);
- _timestampItem.setHeight(_height);
- _senderItem.setHeight(_height);
+void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth, qreal &linePos) {
+ qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
+ linePos -= height;
+ bool needGeometryChange = linePos == pos().y();
+
+ if(needGeometryChange) {
+ _timestampItem.prepareGeometryChange();
+ _senderItem.prepareGeometryChange();
+ }
+ _timestampItem.setHeight(height);
+ _senderItem.setHeight(height);
_contentsItem.clearLayout();
- return _height;
+
+ if(needGeometryChange)
+ prepareGeometryChange();
+
+ _height = height;
+ _width = width;
+
+ setPos(0, linePos); // set pos is _very_ cheap if nothing changes.
}
void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) {
// new line marker
const QAbstractItemModel *model_ = model();
- if(model_ && row() > 0) {
+ if(model_ && row() > 0 && chatScene()->isSingleBufferScene()) {
QModelIndex prevRowIdx = model_->index(row() - 1, 0);
- MsgId msgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value<MsgId>();
- Message::Flags flags = (Message::Flags)model_->data(model_->index(row(), 0), MessageModel::FlagsRole).toInt();
+ MsgId prevMsgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value<MsgId>();
+ QModelIndex myIdx = model_->index(row(), 0);
+ MsgId myMsgId = model_->data(myIdx, MessageModel::MsgIdRole).value<MsgId>();
+ Message::Flags flags = (Message::Flags)model_->data(myIdx, MessageModel::FlagsRole).toInt();
// don't show the marker if we wrote that new line
if(!(flags & Message::Self)) {
- BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value<BufferId>();
- if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) {
+ BufferId bufferId = BufferId(chatScene()->idString().toInt());
+ MsgId lastSeenMsgId = Client::networkModel()->lastSeenMsgId(bufferId);
+ if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) {
QtUiStyleSettings s("Colors");
QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing());
gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value<QColor>());