projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0bf67c9
)
fixing speed up aftermath
author
Marcus Eggenberger
<egs@quassel-irc.org>
Mon, 22 Sep 2008 10:24:26 +0000
(12:24 +0200)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Mon, 22 Sep 2008 10:24:26 +0000
(12:24 +0200)
src/qtui/chatview.cpp
patch
|
blob
|
history
diff --git
a/src/qtui/chatview.cpp
b/src/qtui/chatview.cpp
index
6b2d1f5
..
fe196d0
100644
(file)
--- a/
src/qtui/chatview.cpp
+++ b/
src/qtui/chatview.cpp
@@
-47,7
+47,7
@@
ChatView::ChatView(MessageFilter *filter, QWidget *parent)
void ChatView::init(MessageFilter *filter) {
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
void ChatView::init(MessageFilter *filter) {
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
//
setAlignment(Qt::AlignBottom);
+ setAlignment(Qt::AlignBottom);
setInteractive(true);
setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
setInteractive(true);
setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
@@
-55,7
+55,7
@@
void ChatView::init(MessageFilter *filter) {
_scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent()
connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
_scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent()
connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
-
//
connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *)), this, SLOT(lastLineChanged(QGraphicsItem *)));
+ connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *)), this, SLOT(lastLineChanged(QGraphicsItem *)));
setScene(_scene);
connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
setScene(_scene);
connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
@@
-72,17
+72,18
@@
void ChatView::resizeEvent(QResizeEvent *event) {
}
void ChatView::lastLineChanged(QGraphicsItem *chatLine) {
}
void ChatView::lastLineChanged(QGraphicsItem *chatLine) {
- // FIXME: if vbar offset < chatline height -> centerOn(chatLine);
- centerOn(chatLine);
+ QAbstractSlider *vbar = verticalScrollBar();
+ Q_ASSERT(vbar);
+ if(vbar->maximum() - vbar->value() <= chatLine->boundingRect().height() + 5) { // 5px grace area
+ vbar->setValue(vbar->maximum());
+ }
}
void ChatView::verticalScrollbarChanged(int newPos) {
QAbstractSlider *vbar = verticalScrollBar();
Q_ASSERT(vbar);
}
void ChatView::verticalScrollbarChanged(int newPos) {
QAbstractSlider *vbar = verticalScrollBar();
Q_ASSERT(vbar);
- if(vbar->maximum() - vbar->value() <= 5) // FIXME workaround the fact that the view gets scrolled up a few px on buffer change
- vbar->setValue(vbar->maximum());
-
+ // check for backlog request
if(newPos < _lastScrollbarPos) {
int relativePos = 100;
if(vbar->maximum() - vbar->minimum() != 0)
if(newPos < _lastScrollbarPos) {
int relativePos = 100;
if(vbar->maximum() - vbar->minimum() != 0)