projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
faster ChatLine insertion into the ChatScene. And some minor improvements
[quassel.git]
/
src
/
qtui
/
chatview.cpp
diff --git
a/src/qtui/chatview.cpp
b/src/qtui/chatview.cpp
index
ffd9e72
..
ff0460a
100644
(file)
--- a/
src/qtui/chatview.cpp
+++ b/
src/qtui/chatview.cpp
@@
-21,7
+21,6
@@
#include <QGraphicsTextItem>
#include <QScrollBar>
#include <QGraphicsTextItem>
#include <QScrollBar>
-#include "buffer.h"
#include "chatlinemodelitem.h"
#include "chatscene.h"
#include "chatview.h"
#include "chatlinemodelitem.h"
#include "chatscene.h"
#include "chatview.h"
@@
-29,15
+28,20
@@
#include "messagefilter.h"
#include "quasselui.h"
#include "messagefilter.h"
#include "quasselui.h"
-ChatView::ChatView(Buffer *buf, QWidget *parent) : QGraphicsView(parent), AbstractChatView() {
+ChatView::ChatView(BufferId bufferId, QWidget *parent)
+ : QGraphicsView(parent),
+ AbstractChatView()
+{
QList<BufferId> filterList;
QList<BufferId> filterList;
- filterList.append(buf
->bufferInfo().bufferId()
);
+ filterList.append(buf
ferId
);
MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
init(filter);
MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
init(filter);
-
}
}
-ChatView::ChatView(MessageFilter *filter, QWidget *parent) : QGraphicsView(parent), AbstractChatView() {
+ChatView::ChatView(MessageFilter *filter, QWidget *parent)
+ : QGraphicsView(parent),
+ AbstractChatView()
+{
init(filter);
}
init(filter);
}
@@
-46,69
+50,51
@@
void ChatView::init(MessageFilter *filter) {
setAlignment(Qt::AlignBottom);
setInteractive(true);
setAlignment(Qt::AlignBottom);
setInteractive(true);
- _scene = new ChatScene(filter, filter->idString(), this);
- connect(_scene, SIGNAL(
h
eightChanged(qreal)), this, SLOT(sceneHeightChanged(qreal)));
+ _scene = new ChatScene(filter, filter->idString(),
viewport()->width(),
this);
+ connect(_scene, SIGNAL(
sceneH
eightChanged(qreal)), this, SLOT(sceneHeightChanged(qreal)));
setScene(_scene);
setScene(_scene);
-}
-
-ChatView::~ChatView() {
-}
-
-
-ChatScene *ChatView::scene() const {
- return _scene;
+ _lastScrollbarPos = verticalScrollBar()->maximum();
+ connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
}
void ChatView::resizeEvent(QResizeEvent *event) {
}
void ChatView::resizeEvent(QResizeEvent *event) {
- scene()->setWidth(event->size().width() - 2); // FIXME figure out why we have to hardcode the -2 here
+// scene()->setWidth(event->size().width() - 2); // FIXME figure out why we have to hardcode the -2 here
+ QGraphicsView::resizeEvent(event);
+ scene()->setWidth(viewport()->width());
verticalScrollBar()->setValue(verticalScrollBar()->maximum());
}
verticalScrollBar()->setValue(verticalScrollBar()->maximum());
}
-void ChatView::sceneHeightChanged(qreal h) {
- Q
_UNUSED(h)
-
bool scrollable = verticalScrollBar()->value() == verticalScrollBar()->maximum(
);
- setSceneRect(scene()->sceneRect());
-
if(scrollable) verticalScrollBar()->setValue(verticalScrollBar()
->maximum());
+void ChatView::sceneHeightChanged(qreal
d
h) {
+ Q
AbstractSlider *vbar = verticalScrollBar();
+
Q_ASSERT(vbar
);
+ if(vbar->maximum() - vbar->value() <= dh + 5) // in case we had scrolled only about half a line to the bottom we allow a grace of 5
+
vbar->setValue(vbar
->maximum());
}
}
-void ChatView::
clear()
-{
-}
+void ChatView::
verticalScrollbarChanged(int newPos) {
+ QAbstractSlider *vbar = verticalScrollBar();
+ Q_ASSERT(vbar);
-void ChatView::prependMsg(AbstractUiMsg *msg) {
- //ChatLine *line = dynamic_cast<ChatLine*>(msg);
- //Q_ASSERT(line);
- //prependChatLine(line);
-}
+ if(newPos < _lastScrollbarPos) {
+ int relativePos = 100;
+ if(vbar->maximum() - vbar->minimum() != 0)
+ relativePos = (newPos - vbar->minimum()) * 100 / (vbar->maximum() - vbar->minimum());
-void ChatView::prependChatLine(ChatLine *line) {
- //qDebug() << "prepending";
+ if(relativePos < 20) {
+ scene()->requestBacklog();
+ }
+ }
+ _lastScrollbarPos = newPos;
}
}
-void ChatView::prependChatLines(QList<ChatLine *> clist) {
+MsgId ChatView::lastMsgId() const {
+ if(!scene())
+ return MsgId();
-}
-
-void ChatView::appendMsg(AbstractUiMsg *msg) {
- //ChatLine *line = dynamic_cast<ChatLine*>(msg);
- //Q_ASSERT(line);
- //appendChatLine(line);
-}
-
-void ChatView::appendChatLine(ChatLine *line) {
- //qDebug() << "appending";
-}
+ QAbstractItemModel *model = scene()->model();
+ if(!model || model->rowCount() == 0)
+ return MsgId();
-
-void ChatView::appendChatLines(QList<ChatLine *> list) {
- //foreach(ChatLine *line, list) {
-
- //}
+ return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
}
}
-
-void ChatView::setContents(const QList<AbstractUiMsg *> &list) {
- //qDebug() << "setting" << list.count();
- //appendChatLines(list);
-}
-