X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.h;h=757bd22fe2a34b73e9585b69160d01741c9d9d7c;hp=51b6ff0a1d4c4fd6ae92865ebee8f952bf02264a;hb=3ade6e11e29338aa74fa5daf32456264011601e1;hpb=49f966fd9c04f3aa3149be73bb61b8e1781ce1c2

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index 51b6ff0a..757bd22f 100644
--- a/src/qtui/chatviewsearchcontroller.h
+++ b/src/qtui/chatviewsearchcontroller.h
@@ -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  *
@@ -27,11 +27,11 @@
 #include <QString>
 #include <QTimeLine>
 
+#include "chatscene.h"
 #include "message.h"
 
 class QGraphicsItem;
 class ChatLine;
-class ChatScene;
 class SearchHighlightItem;
 
 class ChatViewSearchController : public QObject {
@@ -58,6 +58,9 @@ private slots:
   void sceneDestroyed();
   void updateHighlights(bool reuse = false);
 
+  void repositionHighlights();
+  void repositionHighlights(ChatLine *line);
+
 signals:
   void newCurrentHighlight(QGraphicsItem *highlightItem);
 
@@ -75,7 +78,10 @@ private:
   inline Qt::CaseSensitivity caseSensitive() const { return _caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; }
 
   inline bool checkType(Message::Type type) const { return type & (Message::Plain | Message::Notice | Message::Action); }
+
+  void checkMessagesForHighlight(int start = 0, int end = -1);
   void highlightLine(ChatLine *line);
+  void updateHighlights(ChatLine *line);
 };
 
 
@@ -84,20 +90,29 @@ private:
 
 class SearchHighlightItem : public QObject, public QGraphicsItem {
   Q_OBJECT
+#if QT_VERSION >= 0x040600
+  Q_INTERFACES(QGraphicsItem)
+#endif
 
 public:
   SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent = 0);
-  inline virtual QRectF boundingRect() const { return _boundingRect; }
+  virtual inline QRectF boundingRect() const { return _boundingRect; }
+  void updateGeometry(qreal width, qreal height);
   virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+  enum { Type = ChatScene::SearchHighlightType };
+  virtual inline int type() const { return Type; }
+
   void setHighlighted(bool highlighted);
 
+  static bool firstInLine(QGraphicsItem *item1, QGraphicsItem *item2);
+
 private slots:
   void updateHighlight(qreal value);
 
 private:
   QRectF _boundingRect;
   bool _highlighted;
-  qreal _alpha;
+  int _alpha;
   QTimeLine _timeLine;
 };