X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=695b513b6efbd773e66ff8ad20e350aeeb3bb11e;hp=14f508ecb25aba63121d724c3e2a027f8aeacf42;hb=a944d240396d5e78086cd9d7b0c6d62b94f9bae7;hpb=22b225ba81373362e6d02a88cd3a906e8c394aac

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 14f508ec..695b513b 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,22 +19,27 @@
  ***************************************************************************/
 
 #include <QGraphicsTextItem>
+#include <QKeyEvent>
 #include <QMenu>
 #include <QScrollBar>
 
 #include "bufferwidget.h"
-#include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "chatview.h"
 #include "client.h"
 #include "messagefilter.h"
-#include "quasselui.h"
+#include "qtui.h"
+#include "qtuistyle.h"
+#include "clientignorelistmanager.h"
 
 ChatView::ChatView(BufferId bufferId, QWidget *parent)
   : QGraphicsView(parent),
     AbstractChatView(),
     _bufferContainer(0),
-    _currentScaleFactor(1)
+    _currentScaleFactor(1),
+    _invalidateFilter(false),
+    _verticalOffset(0),
+    _verticalOffsetStable(false)
 {
   QList<BufferId> filterList;
   filterList.append(bufferId);
@@ -46,14 +51,16 @@ ChatView::ChatView(MessageFilter *filter, QWidget *parent)
   : QGraphicsView(parent),
     AbstractChatView(),
     _bufferContainer(0),
-    _currentScaleFactor(1)
+    _currentScaleFactor(1),
+    _invalidateFilter(false)
 {
   init(filter);
 }
 
 void ChatView::init(MessageFilter *filter) {
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  setAlignment(Qt::AlignBottom);
+  setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+  setAlignment(Qt::AlignLeft|Qt::AlignBottom);
   setInteractive(true);
   //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
   // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
@@ -65,13 +72,17 @@ void ChatView::init(MessageFilter *filter) {
   _scrollTimer.setSingleShot(true);
   connect(&_scrollTimer, SIGNAL(timeout()), SLOT(scrollTimerTimeout()));
 
-  _scene = new ChatScene(filter, filter->idString(), viewport()->width() - 4, this); // see below: resizeEvent()
-  connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
+  _scene = new ChatScene(filter, filter->idString(), viewport()->width(), this);
+  connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(adjustSceneRect()));
   connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *, qreal)), this, SLOT(lastLineChanged(QGraphicsItem *, qreal)));
   connect(_scene, SIGNAL(mouseMoveWhileSelecting(const QPointF &)), this, SLOT(mouseMoveWhileSelecting(const QPointF &)));
   setScene(_scene);
 
   connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
+
+  // only connect if client is synched with a core
+  if(Client::isConnected())
+    connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), this, SLOT(invalidateFilter()));
 }
 
 bool ChatView::event(QEvent *event) {
@@ -83,8 +94,8 @@ bool ChatView::event(QEvent *event) {
     case Qt::Key_PageUp:
     case Qt::Key_PageDown:
       if(!verticalScrollBar()->isVisible()) {
-	scene()->requestBacklog();
-	return true;
+        scene()->requestBacklog();
+        return true;
       }
     default:
       break;
@@ -98,6 +109,11 @@ bool ChatView::event(QEvent *event) {
     }
   }
 
+  if(event->type() == QEvent::Show) {
+    if(_invalidateFilter)
+      invalidateFilter();
+  }
+
   return QGraphicsView::event(event);
 }
 
@@ -106,15 +122,58 @@ void ChatView::resizeEvent(QResizeEvent *event) {
 
   // we can reduce viewport updates if we scroll to the bottom allready at the beginning
   verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-
-  // FIXME: without the hardcoded -4 Qt reserves space for a horizontal scrollbar even though it's disabled permanently.
-  // this does only occur on QtX11 (at least not on Qt for Mac OS). Seems like a Qt Bug.
-  scene()->updateForViewport(viewport()->width() - 4, viewport()->height());
+  scene()->updateForViewport(viewport()->width(), viewport()->height());
+  adjustSceneRect();
 
   _lastScrollbarPos = verticalScrollBar()->maximum();
   verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
+// Workaround for QTBUG-6322
+// The viewport rect gets some margins where it shouldn't, resulting in scrollbars to appear
+void ChatView::adjustSceneRect() {
+  QRectF rect = scene()->sceneRect(); // qDebug() << "sceneRect" << rect;
+  if(rect.height() <= viewport()->height()) {
+    setSceneRect(rect);
+    return;
+  }
+
+  if(_verticalOffsetStable && rect.height() > viewport()->height())
+    setSceneRect(rect.adjusted(0, 0, 0, _verticalOffset));
+  else
+    setSceneRect(rect);
+
+  QScrollBar *vbar = verticalScrollBar();
+  qreal sceneHeight = rect.height();
+  qreal viewHeight = vbar->maximum() + viewport()->height() - vbar->minimum();
+  if(sceneHeight != viewHeight) {
+    qreal voffset = sceneHeight - viewHeight; //voffset *= _currentScaleFactor;
+    // qDebug() << "Adjusting ChatView offset to" << voffset << "(QTBUG-6322)";
+    if(sceneHeight + voffset <= viewport()->height()) {
+      setSceneRect(rect.adjusted(0, -voffset, 0, 0));
+      _verticalOffsetStable = false;
+      return;
+    } else {
+      _verticalOffsetStable = true;
+      _verticalOffset = voffset;
+      setSceneRect(rect.adjusted(0, 0, 0, voffset));
+    }
+    if(vbar->maximum() + viewport()->height() - vbar->minimum() != sceneHeight) {
+      //qWarning() << "Workaround for QTBUG-6322 failed!1!!" << vbar->maximum() + viewport()->height() - vbar->minimum() << sceneHeight;
+      _verticalOffsetStable = false;
+      adjustSceneRect();
+      return;
+    }
+    if(voffset == _verticalOffset)
+      _verticalOffsetStable = true;
+    else {
+      //if(voffset <= 0)
+        _verticalOffset = voffset;
+    }
+  } //else
+    //_verticalOffsetStable = true;
+}
+
 void ChatView::mouseMoveWhileSelecting(const QPointF &scenePos) {
   int y = (int)mapFromScene(scenePos).y();
   _scrollOffset = 0;
@@ -164,6 +223,10 @@ void ChatView::verticalScrollbarChanged(int newPos) {
     }
   }
   _lastScrollbarPos = newPos;
+
+  // FIXME: Fugly workaround for the ChatView scrolling up 1px on buffer switch
+  if(vbar->maximum() - newPos <= 2)
+    vbar->setValue(vbar->maximum());
 }
 
 MsgId ChatView::lastMsgId() const {
@@ -203,3 +266,16 @@ void ChatView::zoomOriginal() {
     _currentScaleFactor = 1;
     scene()->setWidth(viewport()->width() - 2);
 }
+
+void ChatView::invalidateFilter() {
+  // if this is the currently selected chatview
+  // invalidate immediately
+  if(isVisible()) {
+    _scene->filter()->invalidateFilter();
+    _invalidateFilter = false;
+  }
+  // otherwise invalidate whenever the view is shown
+  else {
+    _invalidateFilter = true;
+  }
+}