X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcolumnhandleitem.h;h=d9a73bb52a63ac883f2ab5563e8ca58f2f2963a9;hp=f9d1f7ada0026cce541c46e1b7173a8ccc1ee997;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=0072d69c3387cad4e393968647e0f2894aed6877

diff --git a/src/qtui/columnhandleitem.h b/src/qtui/columnhandleitem.h
index f9d1f7ad..d9a73bb5 100644
--- a/src/qtui/columnhandleitem.h
+++ b/src/qtui/columnhandleitem.h
@@ -1,62 +1,76 @@
 /***************************************************************************
-*   Copyright (C) 2005-08 by the Quassel IRC Team                         *
-*   devel@quassel-irc.org                                                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
 
 #ifndef COLUMNHANDLEITEM_H_
 #define COLUMNHANDLEITEM_H_
 
-#include <QObject>
 #include <QGraphicsItem>
 #include <QGraphicsScene>
-#include <QTimeLine>
+#include <QPropertyAnimation>
 
-class ColumnHandleItem : public QObject, public QGraphicsItem {
-  Q_OBJECT
+#include "chatscene.h"
+
+class ColumnHandleItem : public QGraphicsObject
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity)
 
 public:
-  ColumnHandleItem(qreal width, QGraphicsItem *parent = 0);
+    ColumnHandleItem(qreal width, QGraphicsItem* parent = nullptr);
+    inline int type() const override { return ChatScene::ColumnHandleType; }
+
+    inline qreal width() const { return _width; }
+    inline QRectF boundingRect() const override { return _boundingRect; }
+    inline qreal sceneLeft() const { return _sceneLeft; }
+    inline qreal sceneRight() const { return _sceneRight; }
+
+    inline qreal opacity() const { return _opacity; }
 
-  inline qreal width() const { return _width; }
-  inline QRectF boundingRect() const { return QRectF(0, 0, _width, scene()->height()); }
-  void setXPos(qreal xpos);
+    void setXPos(qreal xpos);
+    void setXLimits(qreal min, qreal max);
 
-  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
 
-  void sceneRectChanged(const QRectF &);
-  void setXLimits(qreal min, qreal max);
+public slots:
+    void sceneRectChanged(const QRectF&);
+    void setOpacity(qreal opacity);
 
 protected:
-  void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-  void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-  void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-  void mousePressEvent(QGraphicsSceneMouseEvent *event);
-  void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void hoverEnterEvent(QGraphicsSceneHoverEvent* event) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override;
 
-private slots:
-  void hoverChanged(qreal value);
+signals:
+    void positionChanged(qreal x);
 
 private:
-  qreal _width;
-  qreal _hover;
-  bool _moving;
-  qreal _minXPos, _maxXPos;
-  QTimeLine _timeLine;
+    qreal _width;
+    qreal _sceneLeft, _sceneRight;
+    QRectF _boundingRect;
+    bool _moving;
+    qreal _offset;
+    qreal _minXPos, _maxXPos;
+    qreal _opacity;
+    QPropertyAnimation* _animation;
 };
 
 #endif