Search result highlights are now properly repositioned on resize

[quassel.git] / src / qtui / chatscene.h

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index 637dfe1..a60b842 100644 (file)
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -39,10 +39,20 @@ class ChatScene : public QGraphicsScene {
   Q_OBJECT
 
 public:
-  enum MyEventTypes {
-    ClearWebPreviewEventType = QEvent::User
+  enum CutoffMode {
+    CutoffLeft,
+    CutoffRight
+  };
+
+  enum ItemType {
+    ChatLineType = QGraphicsItem::UserType + 1,
+    ChatItemType,
+    TimestampChatItemType,
+    SenderChatItemType,
+    ContentsChatItemType,
+    SearchHighlightType,
+    WebPreviewType
   };
-  class ClearWebPreviewEvent;
 
   ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent);
   virtual ~ChatScene();
@@ -56,12 +66,17 @@ public:
   inline bool containsBuffer(const BufferId &id) const;
   inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
 
-  inline ColumnHandleItem *firstColumnHandle() const { return firstColHandle; }
-  inline ColumnHandleItem *secondColumnHandle() const { return secondColHandle; }
+  inline ColumnHandleItem *firstColumnHandle() const { return _firstColHandle; }
+  inline ColumnHandleItem *secondColumnHandle() const { return _secondColHandle; }
+
+  inline CutoffMode senderCutoffMode() const { return _cutoffMode; }
+  inline void setSenderCutoffMode(CutoffMode mode) { _cutoffMode = mode; }
 
-public slots:
+  virtual bool event(QEvent *e);
+
+ public slots:
   void updateForViewport(qreal width, qreal height);
-  void setWidth(qreal, bool forceReposition = false);
+  void setWidth(qreal width);
 
   // these are used by the chatitems to notify the scene and manage selections
   void setSelectingItem(ChatItem *item);
@@ -76,22 +91,22 @@ public slots:
 
 signals:
   void lastLineChanged(QGraphicsItem *item, qreal offset);
+  void layoutChanged(); // indicates changes to the scenerect due to resizing of the contentsitems
 
 protected:
   virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
   virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
   virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
-  virtual void customEvent(QEvent *event);
 
 protected slots:
   void rowsInserted(const QModelIndex &, int, int);
   void rowsAboutToBeRemoved(const QModelIndex &, int, int);
 
 private slots:
-  void handlePositionChanged(qreal xpos);
-  void showWebPreview();
-  void clearWebPreviewEvent(ClearWebPreviewEvent *event);
-  void deleteWebPreview();
+  void firstHandlePositionChanged(qreal xpos);
+  void secondHandlePositionChanged(qreal xpos);
+  void showWebPreviewEvent();
+  void deleteWebPreviewEvent();
 
 private:
   void setHandleXLimits();
@@ -107,23 +122,22 @@ private:
   // we store the size in a member variable.
   QRectF _sceneRect;
   int _firstLineRow; // the first row to display (aka: not a daychange msg)
-  void updateSceneRect();
   void updateSceneRect(qreal width);
+  inline void updateSceneRect() { updateSceneRect(_sceneRect.width()); }
   void updateSceneRect(const QRectF &rect);
   qreal _viewportHeight;
 
-  ColumnHandleItem *firstColHandle, *secondColHandle;
-  qreal firstColHandlePos, secondColHandlePos;
+  ColumnHandleItem *_firstColHandle, *_secondColHandle;
+  qreal _firstColHandlePos, _secondColHandlePos;
+  CutoffMode _cutoffMode;
 
   ChatItem *_selectingItem;
   int _selectionStartCol, _selectionMinCol;
   int _selectionStart;
   int _selectionEnd;
-  int _firstSelectionRow, _lastSelectionRow;
+  int _firstSelectionRow;
   bool _isSelecting;
 
-  int _lastBacklogSize;
-
   struct WebPreview {
     ChatItem *parentItem;
     QGraphicsItem *previewItem;