X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=276c73eda52bc73afe36d137ff139ea8d6386408;hp=df218a51ae9d9e73a1e9708a54bcaa29a0cdbb6f;hb=236dda81632fa792e788d45b0f4f31b973823f7f;hpb=176d22d49934223b9279719ac5d9e7c03e530d40 diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index df218a51..276c73ed 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 * @@ -34,22 +34,6 @@ #include "qtuisettings.h" #include "qtuistyle.h" -// ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent) -// : QGraphicsItem(parent), -// _row(row), // needs to be set before the items -// _model(model), -// _contentsItem(this), -// _senderItem(this), -// _timestampItem(this), -// _width(0), -// _height(0), -// _selection(0) -// { -// Q_ASSERT(model); -// QModelIndex index = model->index(row, ChatLineModel::ContentsColumn); -// setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight); -// } - ChatLine::ChatLine(int row, QAbstractItemModel *model, const qreal &width, const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, @@ -67,14 +51,10 @@ ChatLine::ChatLine(int row, QAbstractItemModel *model, { Q_ASSERT(model); QModelIndex index = model->index(row, ChatLineModel::ContentsColumn); + setZValue(0); setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight); } -QRectF ChatLine::boundingRect () const { - //return childrenBoundingRect(); - return QRectF(0, 0, _width, _height); -} - ChatItem &ChatLine::item(ChatLineModel::ColumnType column) { switch(column) { case ChatLineModel::TimestampColumn: @@ -88,60 +68,71 @@ ChatItem &ChatLine::item(ChatLineModel::ColumnType column) { } } -// 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(); - _senderItem.clearLayout(); _timestampItem.clearLayout(); - - return _height; + _senderItem.clearLayout(); } -// 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); +// 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); + + _senderItem.clearLayout(); _contentsItem.clearLayout(); - return _height; -} -qreal ChatLine::setGeometryByWidth(qreal width) { - if(width != _width) + if(needGeometryChange) prepareGeometryChange(); - ColumnHandleItem *firstColumnHandle = chatScene()->firstColumnHandle(); - ColumnHandleItem *secondColumnHandle = chatScene()->secondColumnHandle(); + _height = height; + + setPos(0, linePos); +} + +void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth, qreal &linePos) { + qreal height = _contentsItem.setGeometryByWidth(contentsWidth); + linePos -= height; + bool needGeometryChange = linePos == pos().y(); - _height = _contentsItem.setGeometryByWidth(width - secondColumnHandle->sceneRight()); - _timestampItem.setGeometry(firstColumnHandle->sceneLeft(), _height); - _senderItem.setGeometry(secondColumnHandle->sceneLeft() - firstColumnHandle->sceneRight(), _height); + if(needGeometryChange) { + _timestampItem.prepareGeometryChange(); + _senderItem.prepareGeometryChange(); + } + _timestampItem.setHeight(height); + _senderItem.setHeight(height); + _contentsItem.clearLayout(); - _senderItem.setPos(firstColumnHandle->sceneRight(), 0); - _contentsItem.setPos(secondColumnHandle->sceneRight(), 0); + if(needGeometryChange) + prepareGeometryChange(); + _height = height; _width = width; - return _height; + + setPos(0, linePos); // set pos is _very_ cheap if nothing changes. } void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) { if(selected) { - quint8 sel = (_selection & 0x80) | 0x40 | minColumn; + quint8 sel = (_selection & Highlighted) | Selected | minColumn; if(sel != _selection) { _selection = sel; for(int i = 0; i < minColumn; i++) @@ -151,7 +142,7 @@ void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) { update(); } } else { - quint8 sel = _selection & 0x80; + quint8 sel = _selection & Highlighted; if(sel != _selection) { _selection = sel; for(int i = 0; i <= ChatLineModel::ContentsColumn; i++) @@ -162,8 +153,8 @@ void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) { } void ChatLine::setHighlighted(bool highlighted) { - if(highlighted) _selection |= 0x80; - else _selection &= 0x7f; + if(highlighted) _selection |= Highlighted; + else _selection &= ~Highlighted; update(); } @@ -174,23 +165,26 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->fillRect(boundingRect(), QBrush(QtUi::style()->highlightColor())); } if(_selection & Selected) { - qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f)).x(); + qreal left = item((ChatLineModel::ColumnType)(_selection & ItemMask)).x(); QRectF selectRect(left, 0, width() - left, height()); painter->fillRect(selectRect, QApplication::palette().brush(QPalette::Highlight)); } // 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(); - Message::Flags flags = (Message::Flags)model_->data(model_->index(row(), 0), MessageModel::FlagsRole).toInt(); + MsgId prevMsgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value(); + QModelIndex myIdx = model_->index(row(), 0); + MsgId myMsgId = model_->data(myIdx, MessageModel::MsgIdRole).value(); + 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(); - if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) { + BufferId bufferId = BufferId(chatScene()->idString().toInt()); + MsgId lastSeenMsgId = Client::networkModel()->lastSeenMarkerMsgId(bufferId); + if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) { 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);