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

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 96e8d944..ed71dd07 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -30,7 +30,8 @@
 
 ChatView::ChatView(BufferId bufferId, QWidget *parent)
   : QGraphicsView(parent),
-    AbstractChatView()
+    AbstractChatView(),
+    _currentScaleFactor(1)
 {
   QList<BufferId> filterList;
   filterList.append(bufferId);
@@ -40,7 +41,8 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent)
 
 ChatView::ChatView(MessageFilter *filter, QWidget *parent)
   : QGraphicsView(parent),
-    AbstractChatView()
+    AbstractChatView(),
+    _currentScaleFactor(1)
 {
   init(filter);
 }
@@ -49,35 +51,49 @@ void ChatView::init(MessageFilter *filter) {
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setAlignment(Qt::AlignBottom);
   setInteractive(true);
+  //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
+  // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
+  setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+  // setTransformationAnchor(QGraphicsView::NoAnchor);
+  setTransformationAnchor(QGraphicsView::AnchorViewCenter); 
 
-  _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() - 2, this); // see below: resizeEvent()
+  connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
+  connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *, qreal)), this, SLOT(lastLineChanged(QGraphicsItem *, qreal)));
   setScene(_scene);
+  // installEventFilter(_scene);
 
-  _lastScrollbarPos = 0;
   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
+  QGraphicsView::resizeEvent(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());
+
+  _lastScrollbarPos = verticalScrollBar()->maximum();
   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::lastLineChanged(QGraphicsItem *chatLine, qreal offset) {
+  Q_UNUSED(chatLine)
+  QAbstractSlider *vbar = verticalScrollBar();
+  Q_ASSERT(vbar);
+  if(vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area
+    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()); 
 
+  // check for backlog request
   if(newPos < _lastScrollbarPos) {
     int relativePos = 100;
     if(vbar->maximum() - vbar->minimum() != 0)
@@ -100,3 +116,21 @@ MsgId ChatView::lastMsgId() const {
 
   return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
 }
+
+void ChatView::zoomIn() { 
+    _currentScaleFactor *= 1.2;
+    scale(1.2, 1.2);
+    scene()->setWidth(viewport()->width() / _currentScaleFactor - 2);
+}
+
+void ChatView::zoomOut() {
+    _currentScaleFactor /= 1.2;
+    scale(1 / 1.2, 1 / 1.2);
+    scene()->setWidth(viewport()->width() / _currentScaleFactor - 2);
+}
+
+void ChatView::zoomNormal() {
+    scale(1/_currentScaleFactor, 1/_currentScaleFactor);
+    _currentScaleFactor = 1;
+    scene()->setWidth(viewport()->width() - 2);
+}