Fix focus-rectangle issues

[dolphin.git] / src / kitemviews / kitemlistwidget.h

diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index eb2ebf4558b42a3e490dfd892e535d10bff463ef..4c8ff1a9520fd30975ab1f9f644e0274a866eed2 100644 (file)
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -27,8 +27,11 @@
 
 #include <kitemviews/kitemliststyleoption.h>
 
 
 #include <kitemviews/kitemliststyleoption.h>
 

+#include <QBitArray>

 #include <QGraphicsWidget>
 #include <QGraphicsWidget>

+#include <QStyle>

 
 

+class KItemListSelectionToggle;

 class QPropertyAnimation;
 
 /**
 class QPropertyAnimation;
 
 /**


@@ -53,37 +56,78 @@ public:
     QHash<QByteArray, QVariant> data() const;
 
     /**
     QHash<QByteArray, QVariant> data() const;
 
     /**

-     * Draws the hover-bounding-rectangle if the item is hovered. Overwrite this method
+     * Draws the hover-rectangle if the item is hovered. Overwrite this method

      * to show the data of the custom model provided by KItemListWidget::data().
      * @reimp
      */
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
 
      * to show the data of the custom model provided by KItemListWidget::data().
      * @reimp
      */
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
 

+    void setVisibleRoles(const QList<QByteArray>& roles);
+    QList<QByteArray> visibleRoles() const;
+

     /**
     /**

-     * Sets the visible roles to \p roles. The integer-value defines
-     * the order of the visible role: Smaller values are ordered first.
+     * Sets the width of a role that should be used if the alignment of the content
+     * should be done in columns.

      */
      */

-    void setVisibleRoles(const QHash<QByteArray, int>& roles);
-    QHash<QByteArray, int> visibleRoles() const;
-
-    void setVisibleRolesSizes(const QHash<QByteArray, QSizeF> rolesSizes);
-    QHash<QByteArray, QSizeF> visibleRolesSizes() const;
+    void setColumnWidth(const QByteArray& role, qreal width);
+    qreal columnWidth(const QByteArray& role) const;

 
     void setStyleOption(const KItemListStyleOption& option);
     const KItemListStyleOption& styleOption() const;
 
 
     void setStyleOption(const KItemListStyleOption& option);
     const KItemListStyleOption& styleOption() const;
 

+    // TODO: Hides QGraphicsItem::setSelected()/isSelected(). Replace
+    // this by using the default mechanism.
+    void setSelected(bool selected);
+    bool isSelected() const;
+
+    void setCurrent(bool current);
+    bool isCurrent() const;
+
+    void setHovered(bool hovered);
+    bool isHovered() const;
+
+    void setAlternateBackground(bool enable);
+    bool alternateBackground() const;
+
+    void setEnabledSelectionToggle(bool enabled);
+    bool enabledSelectionToggle() const;
+
+    /**
+     * Sets the sibling information for the item and all of its parents.
+     * The sibling information of the upper most parent is represented by
+     * the first bit, the sibling information of the item by the last bit.
+     * The sibling information is useful for drawing the branches in
+     * tree views.
+     */
+    void setSiblingsInformation(const QBitArray& siblings);
+    QBitArray siblingsInformation() const;
+

     /**
     /**

-     * @return True if \a point is inside KItemListWidget::hoverBoundingRect(),
-     *         KItemListWidget::selectionToggleRect() or KItemListWidget::expansionToggleRect().
+     * @return True if \a point is inside KItemListWidget::hoverRect(),
+     *         KItemListWidget::textRect(), KItemListWidget::selectionToggleRect()
+     *         or KItemListWidget::expansionToggleRect().

      * @reimp
      */
     virtual bool contains(const QPointF& point) const;
 
     /**
      * @reimp
      */
     virtual bool contains(const QPointF& point) const;
 
     /**

-     * @return Bounding rectangle for the area that acts as hovering-area. Per default
-     *         the bounding rectangle of the KItemListWidget is returned.
+     * @return Rectangle for the area that shows the icon.

      */
      */

-    virtual QRectF hoverBoundingRect() const;
+    virtual QRectF iconRect() const = 0;
+
+    /**
+     * @return Rectangle for the area that contains the text-properties.
+     */
+    virtual QRectF textRect() const = 0;
+
+    /**
+     * @return Focus rectangle for indicating the current item. Per default
+     *         textRect() will be returned. Overwrite this method if textRect()
+     *         provides a larger rectangle than the actual text (e.g. to
+     *         be aligned with the iconRect()). The textFocusRect() may not be
+     *         outside the boundaries of textRect().
+     */
+    virtual QRectF textFocusRect() const;

 
     /**
      * @return Rectangle for the selection-toggle that is used to select or deselect an item.
 
     /**
      * @return Rectangle for the selection-toggle that is used to select or deselect an item.


@@ -101,9 +145,14 @@ public:
 
 protected:
     virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>());
 
 protected:
     virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>());

-    virtual void visibleRolesChanged(const QHash<QByteArray, int>& current, const QHash<QByteArray, int>& previous);
-    virtual void visibleRolesSizesChanged(const QHash<QByteArray, QSizeF>& current, const QHash<QByteArray, QSizeF>& previous);
+    virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous);
+    virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous);

     virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous);
     virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous);

+    virtual void currentChanged(bool current);
+    virtual void selectedChanged(bool selected);
+    virtual void hoveredChanged(bool hovered);
+    virtual void alternateBackgroundChanged(bool enabled);
+    virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous);

     virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
 
     /**
     virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
 
     /**


@@ -112,22 +161,35 @@ protected:
      */
     qreal hoverOpacity() const;
 
      */
     qreal hoverOpacity() const;
 

+private slots:
+    void slotHoverAnimationFinished();
+

 private:
 private:

+    void initializeSelectionToggle();

     void setHoverOpacity(qreal opacity);
     void setHoverOpacity(qreal opacity);

-    void clearCache();
+    void clearHoverCache();
+    void drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState);

 
 private:
     Q_PROPERTY(qreal hoverOpacity READ hoverOpacity WRITE setHoverOpacity)
 
     int m_index;
 
 private:
     Q_PROPERTY(qreal hoverOpacity READ hoverOpacity WRITE setHoverOpacity)
 
     int m_index;

+    bool m_selected;
+    bool m_current;
+    bool m_hovered;
+    bool m_alternateBackground;
+    bool m_enabledSelectionToggle;

     QHash<QByteArray, QVariant> m_data;
     QHash<QByteArray, QVariant> m_data;

-    QHash<QByteArray, int> m_visibleRoles;
-    QHash<QByteArray, QSizeF> m_visibleRolesSizes;
+    QList<QByteArray> m_visibleRoles;
+    QHash<QByteArray, qreal> m_columnWidths;

     KItemListStyleOption m_styleOption;
     KItemListStyleOption m_styleOption;

+    QBitArray m_siblingsInfo;

 
     qreal m_hoverOpacity;
     mutable QPixmap* m_hoverCache;
     QPropertyAnimation* m_hoverAnimation;
 
     qreal m_hoverOpacity;
     mutable QPixmap* m_hoverCache;
     QPropertyAnimation* m_hoverAnimation;

+
+    KItemListSelectionToggle* m_selectionToggle;

 };
 #endif
 
 };
 #endif