X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=5bc02c5758bc7ef5ad3714232ece98d30812e27f;hp=a4582546a8bad425e28bfa7005395266b1154025;hb=9ce42695baef3bdd6f61aaff23c4b59061e46fe6;hpb=99bb37d9938f3d88ce7551ded454146359fadc03

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index a4582546..5bc02c57 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -19,25 +19,28 @@
  ***************************************************************************/
 
 #include <QGraphicsTextItem>
+#include <QScrollBar>
 
 #include "buffer.h"
 #include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "chatview.h"
 #include "client.h"
+#include "messagefilter.h"
 #include "quasselui.h"
 
 ChatView::ChatView(Buffer *buf, QWidget *parent) : QGraphicsView(parent), AbstractChatView() {
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  setOptimizationFlags(QGraphicsView::DontClipPainter
-      |QGraphicsView::DontSavePainterState
-      |QGraphicsView::DontAdjustForAntialiasing);
-  _scene = new ChatScene(Client::messageModel(), this);
-  connect(_scene, SIGNAL(heightChanged(int)), this, SLOT(sceneHeightChanged(int)));
-  //_scene->setWidth(width());
-  setScene(_scene);
-  setSceneRect(0, 0, width(), 0);
+  setAlignment(Qt::AlignBottom);
+  setInteractive(true);
+
+  QList<BufferId> filterList;
+  filterList.append(buf->bufferInfo().bufferId());
+  MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
 
+  _scene = new ChatScene(filter, filter->idString(), this);
+  connect(_scene, SIGNAL(heightChanged(qreal)), this, SLOT(sceneHeightChanged(qreal)));
+  setScene(_scene);
 }
 
 
@@ -51,12 +54,15 @@ ChatScene *ChatView::scene() const {
 }
 
 void ChatView::resizeEvent(QResizeEvent *event) {
-  scene()->setWidth(event->size().width());
-  qDebug() << "resize";
+  scene()->setWidth(event->size().width() - 2);  // FIXME figure out why we have to hardcode the -2 here
+  verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
-void ChatView::sceneHeightChanged(int h) {
-  setSceneRect(0, 0, width(), h);
+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::clear()
@@ -90,7 +96,7 @@ void ChatView::appendChatLine(ChatLine *line) {
 
 void ChatView::appendChatLines(QList<ChatLine *> list) {
   //foreach(ChatLine *line, list) {
-    
+
   //}
 }