X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=ff0460aa15abfa3626ffe22af3651e7d431e80cb;hp=96e8d9443c52f0315c07b186282a63f45526a091;hb=1a8f18df3db5cebd77fbba1c0dc726a4da2c1b72;hpb=ba8e1ef2885c265a43d9147781407bd844b439c8

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 96e8d944..ff0460aa 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -50,33 +50,31 @@ void ChatView::init(MessageFilter *filter) {
   setAlignment(Qt::AlignBottom);
   setInteractive(true);
 
-  _scene = new ChatScene(filter, filter->idString(), this);
-  connect(_scene, SIGNAL(heightChangedAt(qreal, qreal)), this, SLOT(sceneHeightChangedAt(qreal, qreal)));
+  _scene = new ChatScene(filter, filter->idString(), viewport()->width(), this);
+  connect(_scene, SIGNAL(sceneHeightChanged(qreal)), this, SLOT(sceneHeightChanged(qreal)));
   setScene(_scene);
 
-  _lastScrollbarPos = 0;
+  _lastScrollbarPos = verticalScrollBar()->maximum();
   connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
 }
 
 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());
 }
 
-void ChatView::sceneHeightChangedAt(qreal ypos, qreal hdiff) {
-  setSceneRect(scene()->sceneRect());
-  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::sceneHeightChanged(qreal dh) {
+  QAbstractSlider *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::verticalScrollbarChanged(int newPos) {
   QAbstractSlider *vbar = verticalScrollBar();
   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;