X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=ddec8fbec439cb0d96eaf5a60c21f516fe378173;hp=e7386efc1fc2bca39f01905af0529145396867a4;hb=e3314686ed9fe6203ed194ab4d73791176c2e051;hpb=4f2cf796763079da1079751bbdac9b905689ec11

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index e7386efc..ddec8fbe 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -32,12 +32,11 @@
 #include "qtuistyle.h"
 #include "clientignorelistmanager.h"
 
+#include "chatline.h"
+
 ChatView::ChatView(BufferId bufferId, QWidget *parent)
   : QGraphicsView(parent),
-    AbstractChatView(),
-    _bufferContainer(0),
-    _currentScaleFactor(1),
-    _invalidateFilter(false)
+    AbstractChatView()
 {
   QList<BufferId> filterList;
   filterList.append(bufferId);
@@ -47,17 +46,21 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent)
 
 ChatView::ChatView(MessageFilter *filter, QWidget *parent)
   : QGraphicsView(parent),
-    AbstractChatView(),
-    _bufferContainer(0),
-    _currentScaleFactor(1),
-    _invalidateFilter(false)
+    AbstractChatView()
 {
   init(filter);
 }
 
 void ChatView::init(MessageFilter *filter) {
+  _bufferContainer = 0;
+  _currentScaleFactor = 1;
+  _invalidateFilter = false;
+  _markerLineVisible = true;
+  _markedLine = 0;
+
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  setAlignment(Qt::AlignBottom);
+  setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+  setAlignment(Qt::AlignLeft|Qt::AlignBottom);
   setInteractive(true);
   //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
   // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
@@ -69,13 +72,16 @@ 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)));
+  _lastScrollbarPos = verticalScrollBar()->value();
+
+  connect(Client::networkModel(), SIGNAL(markerLineSet(BufferId,MsgId)), SLOT(markerLineSet(BufferId,MsgId)));
 
   // only connect if client is synched with a core
   if(Client::isConnected())
@@ -119,15 +125,24 @@ 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());
 }
 
+void ChatView::adjustSceneRect() {
+  // Workaround for QTBUG-6322
+  // If the viewport's sceneRect() is (almost) as wide as as the viewport itself,
+  // Qt wants to reserve space for scrollbars even if they're turned off, resulting in
+  // an ugly white space at the bottom of the ChatView.
+  // Since the view's scene's width actually doesn't matter at all, we just adjust it
+  // by some hopefully large enough value to avoid this problem.
+
+  setSceneRect(scene()->sceneRect().adjusted(0, 0, -25 ,0));
+}
+
 void ChatView::mouseMoveWhileSelecting(const QPointF &scenePos) {
   int y = (int)mapFromScene(scenePos).y();
   _scrollOffset = 0;
@@ -191,7 +206,97 @@ MsgId ChatView::lastMsgId() const {
   if(!model || model->rowCount() == 0)
     return MsgId();
 
-  return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
+  return model->index(model->rowCount() - 1, 0).data(MessageModel::MsgIdRole).value<MsgId>();
+}
+
+MsgId ChatView::lastVisibleMsgId() const {
+  ChatLine *line = lastVisibleChatLine();
+
+  if(line)
+    return line->msgId();
+
+  return MsgId();
+}
+
+bool chatLinePtrLessThan(ChatLine *one, ChatLine *other) {
+  return one->row() < other->row();
+}
+
+QSet<ChatLine *> ChatView::visibleChatLines(Qt::ItemSelectionMode mode) const {
+  QSet<ChatLine *> result;
+  foreach(QGraphicsItem *item, items(viewport()->rect().adjusted(-1, -1, 1, 1), mode)) {
+    ChatLine *line = qgraphicsitem_cast<ChatLine *>(item);
+    if(line)
+      result.insert(line);
+  }
+  return result;
+}
+
+QList<ChatLine *> ChatView::visibleChatLinesSorted(Qt::ItemSelectionMode mode) const {
+  QList<ChatLine *> result = visibleChatLines(mode).toList();
+  qSort(result.begin(), result.end(), chatLinePtrLessThan);
+  return result;
+}
+
+ChatLine *ChatView::lastVisibleChatLine() const {
+  if(!scene())
+    return 0;
+
+  QAbstractItemModel *model = scene()->model();
+  if(!model || model->rowCount() == 0)
+    return 0;
+
+  int row = -1;
+
+  QSet<ChatLine *> visibleLines = visibleChatLines(Qt::ContainsItemBoundingRect);
+  foreach(ChatLine *line, visibleLines) {
+    if(line->row() > row)
+      row = line->row();
+  }
+
+  if(row >= 0)
+    return scene()->chatLine(row);
+
+  return 0;
+}
+
+void ChatView::setMarkerLineVisible(bool visible) {
+  if(visible != _markerLineVisible) {
+    _markerLineVisible = visible;
+  }
+}
+
+void ChatView::setMarkedLine(ChatLine *line) {
+  if(_markedLine == line)
+    return;
+
+  if(!scene()->isSingleBufferScene())
+    return;
+
+  if(line) {
+    BufferId bufId = scene()->singleBufferId();
+    Client::setMarkerLine(bufId, line->msgId());
+  }
+}
+
+void ChatView::markerLineSet(BufferId buffer, MsgId msg) {
+  if(!scene()->isSingleBufferScene() || scene()->singleBufferId() != buffer)
+    return;
+
+  ChatLine *newLine = scene()->chatLine(msg);
+  if(_markedLine == newLine)
+    return;
+
+  ChatLine *oldLine = _markedLine;
+  _markedLine = newLine;
+
+  if(oldLine)
+    oldLine->update();
+
+  if(newLine) {
+    setMarkerLineVisible(true);
+    newLine->update();
+  }
 }
 
 void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos) {