X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=96e8d9443c52f0315c07b186282a63f45526a091;hp=dbddaaa7ced5505570002304a7e98a33fc581465;hb=bcb94767ec585a25b83bfb7a4e236fb40cc32570;hpb=9d52e49424afb60c2f28073051c1dbf25f47adec

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index dbddaaa7..96e8d944 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -21,7 +21,6 @@
 #include <QGraphicsTextItem>
 #include <QScrollBar>
 
-#include "buffer.h"
 #include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "chatview.h"
@@ -29,15 +28,14 @@
 #include "messagefilter.h"
 #include "quasselui.h"
 
-ChatView::ChatView(Buffer *buf, QWidget *parent)
+ChatView::ChatView(BufferId bufferId, QWidget *parent)
   : QGraphicsView(parent),
     AbstractChatView()
 {
   QList<BufferId> filterList;
-  filterList.append(buf->bufferInfo().bufferId());
+  filterList.append(bufferId);
   MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
   init(filter);
-
 }
 
 ChatView::ChatView(MessageFilter *filter, QWidget *parent)
@@ -53,11 +51,10 @@ void ChatView::init(MessageFilter *filter) {
   setInteractive(true);
 
   _scene = new ChatScene(filter, filter->idString(), this);
-  connect(_scene, SIGNAL(heightChanged(qreal)), this, SLOT(sceneHeightChanged(qreal)));
+  connect(_scene, SIGNAL(heightChangedAt(qreal, qreal)), this, SLOT(sceneHeightChangedAt(qreal, qreal)));
   setScene(_scene);
 
-  connect(verticalScrollBar(), SIGNAL(sliderPressed()), this, SLOT(sliderPressed()));
-  connect(verticalScrollBar(), SIGNAL(sliderReleased()), this, SLOT(sliderReleased()));
+  _lastScrollbarPos = 0;
   connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
 }
 
@@ -66,39 +63,40 @@ void ChatView::resizeEvent(QResizeEvent *event) {
   verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
-void ChatView::sceneHeightChanged(qreal h) {
-  Q_UNUSED(h)
-  bool scrollable = qAbs(verticalScrollBar()->value() - verticalScrollBar()->maximum()) <= 2; // be a bit tolerant here, also FIXME (why we need this?)
+void ChatView::sceneHeightChangedAt(qreal ypos, qreal hdiff) {
   setSceneRect(scene()->sceneRect());
-  if(scrollable) verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-}
-
-void ChatView::setBufferForBacklogFetching(BufferId id) {
-  scene()->setBufferForBacklogFetching(id);
-}
-
-void ChatView::sliderPressed() {
-  verticalScrollbarChanged(verticalScrollBar()->value());
-}
-
-void ChatView::sliderReleased() {
-  if(scene()->isFetchingBacklog()) scene()->setIsFetchingBacklog(false);
+  int y = mapFromScene(0, ypos).y();
+  if(y <= viewport()->height() + 2) {  // be a bit tolerant here, also FIXME (why we need the 2px?)
+    verticalScrollBar()->setValue(verticalScrollBar()->value() + hdiff);
+  }
 }
 
 void ChatView::verticalScrollbarChanged(int newPos) {
-  Q_UNUSED(newPos);
-  if(!scene()->isBacklogFetchingEnabled()) return;
-
   QAbstractSlider *vbar = verticalScrollBar();
-  if(!vbar)
-    return;
-  if(vbar->isSliderDown()) {
-    /*
+  Q_ASSERT(vbar);
+  
+  // FIXME dirty hack to battle the "I just scroll up a pixel on hide()/show()" problem
+  if(vbar->maximum() - vbar->value() < 5) vbar->setValue(vbar->maximum()); 
+
+  if(newPos < _lastScrollbarPos) {
     int relativePos = 100;
     if(vbar->maximum() - vbar->minimum() != 0)
       relativePos = (newPos - vbar->minimum()) * 100 / (vbar->maximum() - vbar->minimum());
-    scene()->setIsFetchingBacklog(relativePos < 20);
-    */
-    scene()->setIsFetchingBacklog(vbar->value() == vbar->minimum());
+
+    if(relativePos < 20) {
+      scene()->requestBacklog();
+    }
   }
+  _lastScrollbarPos = newPos;
+}
+
+MsgId ChatView::lastMsgId() const {
+  if(!scene())
+    return MsgId();
+
+  QAbstractItemModel *model = scene()->model();
+  if(!model || model->rowCount() == 0)
+    return MsgId();
+
+  return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
 }