X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.h;h=2f568d31ff0b557f567554c9432575785922d79a;hb=01ed2953cbad3f2de3df262dc1601e82d903b4a8;hp=f3c3d6e5212cff3dd9c3728eaee7dba55cd405b1;hpb=8c171717381424c896b9f720db203ddb815c76e1;p=quassel.git

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index f3c3d6e5..2f568d31 100644
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -51,12 +51,13 @@ 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; }
 
 public slots:
   void updateForViewport(qreal width, qreal height);
-  void setWidth(qreal, bool forceReposition = false);
+  //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);
@@ -70,7 +71,7 @@ public slots:
   void clearWebPreview(ChatItem *parentItem = 0);
 
 signals:
-  void lastLineChanged(QGraphicsItem *);
+  void lastLineChanged(QGraphicsItem *item, qreal offset);
 
 protected:
   virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
@@ -83,9 +84,10 @@ protected slots:
   void rowsAboutToBeRemoved(const QModelIndex &, int, int);
 
 private slots:
-  void handlePositionChanged(qreal xpos);
-  void showWebPreview();
-  void clearWebPreviewEvent();
+  void firstHandlePositionChanged(qreal xpos);
+  void secondHandlePositionChanged(qreal xpos);
+  void showWebPreviewEvent();
+  void deleteWebPreviewEvent();
 
 private:
   void setHandleXLimits();
@@ -101,13 +103,13 @@ 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;
 
   ChatItem *_selectingItem;
   int _selectionStartCol, _selectionMinCol;
@@ -120,10 +122,11 @@ private:
 
   struct WebPreview {
     ChatItem *parentItem;
-    WebPreviewItem *previewItem;
+    QGraphicsItem *previewItem;
     QString url;
     QRectF urlRect;
     QTimer delayTimer;
+    QTimer deleteTimer;
     WebPreview() : parentItem(0), previewItem(0) {}
   };
   WebPreview webPreview;