Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index cfb9155eb75898423fc6af1760a261a14eb3926e..66b2da069cecb173ede4b51329ce4dbc745aeb80 100644 (file)
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -1,8 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *

- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *

  *                                                                         *
  *   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  *
  *                                                                         *
  *   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  *


@@ -23,9 +22,8 @@
 #ifndef KITEMLISTWIDGET_H
 #define KITEMLISTWIDGET_H
 
 #ifndef KITEMLISTWIDGET_H
 #define KITEMLISTWIDGET_H
 

-#include <libdolphin_export.h>
-
-#include <kitemviews/kitemliststyleoption.h>
+#include "dolphin_export.h"
+#include "kitemviews/kitemliststyleoption.h"

 
 #include <QBitArray>
 #include <QGraphicsWidget>
 
 #include <QBitArray>
 #include <QGraphicsWidget>


@@ -43,13 +41,13 @@ class QPropertyAnimation;
  * size for the invisible items must be accessible. KItemListWidgetInformant
  * provides this information.
  */
  * size for the invisible items must be accessible. KItemListWidgetInformant
  * provides this information.
  */

-class LIBDOLPHINPRIVATE_EXPORT KItemListWidgetInformant
+class DOLPHIN_EXPORT KItemListWidgetInformant

 {
 public:
     KItemListWidgetInformant();
     virtual ~KItemListWidgetInformant();
 
 {
 public:
     KItemListWidgetInformant();
     virtual ~KItemListWidgetInformant();
 

-    virtual void calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const = 0;
+    virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const = 0;

 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,
 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,


@@ -63,13 +61,13 @@ public:
  * All properties are set by KItemListView, for each property there is a corresponding
  * virtual protected method that allows to react on property changes.
  */
  * All properties are set by KItemListView, for each property there is a corresponding
  * virtual protected method that allows to react on property changes.
  */

-class LIBDOLPHINPRIVATE_EXPORT KItemListWidget : public QGraphicsWidget
+class DOLPHIN_EXPORT KItemListWidget : public QGraphicsWidget

 {
     Q_OBJECT
 
 public:
     KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
 {
     Q_OBJECT
 
 public:
     KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);

-    virtual ~KItemListWidget();
+    ~KItemListWidget() override;

 
     void setIndex(int index);
     int index() const;
 
     void setIndex(int index);
     int index() const;


@@ -82,7 +80,7 @@ public:
      * to show the data of the custom model provided by KItemListWidget::data().
      * @reimp
      */
      * 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 paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;

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


@@ -142,7 +140,7 @@ public:
      *         or KItemListWidget::expansionToggleRect().
      * @reimp
      */
      *         or KItemListWidget::expansionToggleRect().
      * @reimp
      */

-    virtual bool contains(const QPointF& point) const;
+    bool contains(const QPointF& point) const override;

 
     /**
      * @return Rectangle for the area that shows the icon.
 
     /**
      * @return Rectangle for the area that shows the icon.


@@ -163,6 +161,11 @@ public:
      */
     virtual QRectF textFocusRect() const;
 
      */
     virtual QRectF textFocusRect() const;
 

+    /**
+     * @return Rectangle around which a selection box should be drawn if the item is selected.
+     */
+    virtual QRectF selectionRect() const = 0;
+

     /**
      * @return Rectangle for the selection-toggle that is used to select or deselect an item.
      *         Per default an empty rectangle is returned which means that no selection-toggle
     /**
      * @return Rectangle for the selection-toggle that is used to select or deselect an item.
      *         Per default an empty rectangle is returned which means that no selection-toggle


@@ -181,7 +184,7 @@ public:
      * @return Pixmap that is used when dragging an item. Per default the current state of the
      *         widget is returned as pixmap.
      */
      * @return Pixmap that is used when dragging an item. Per default the current state of the
      *         widget is returned as pixmap.
      */

-    virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr);

 
 signals:
     void roleEditingCanceled(int index, const QByteArray& role, const QVariant& value);
 
 signals:
     void roleEditingCanceled(int index, const QByteArray& role, const QVariant& value);


@@ -198,7 +201,7 @@ protected:
     virtual void alternateBackgroundChanged(bool enabled);
     virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous);
     virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous);
     virtual void alternateBackgroundChanged(bool enabled);
     virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous);
     virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous);

-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+    void resizeEvent(QGraphicsSceneResizeEvent* event) override;

 
     /**
      * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state
 
     /**
      * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state