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

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

diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index cf6f27c03ce3a9a2403a4a82d2c4185d34ab66b5..2a3b7ada27569f3e4544936b158a801384d398f3 100644 (file)
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.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,13 +22,13 @@
 #ifndef KITEMLISTVIEW_H
 #define KITEMLISTVIEW_H
 
 #ifndef KITEMLISTVIEW_H
 #define KITEMLISTVIEW_H
 

-#include <libdolphin_export.h>
+#include "dolphin_export.h"
+#include "kitemviews/kitemliststyleoption.h"
+#include "kitemviews/kitemlistwidget.h"
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/kstandarditemlistgroupheader.h"
+#include "kitemviews/private/kitemlistviewanimation.h"

 
 

-#include <kitemviews/kstandarditemlistgroupheader.h>
-#include <kitemviews/kitemliststyleoption.h>
-#include <kitemviews/kitemlistwidget.h>
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/private/kitemlistviewanimation.h>

 #include <QGraphicsWidget>
 #include <QSet>
 
 #include <QGraphicsWidget>
 #include <QSet>
 


@@ -44,7 +43,6 @@ class KItemListViewLayouter;
 class KItemListWidget;
 class KItemListWidgetInformant;
 class KItemListWidgetCreatorBase;
 class KItemListWidget;
 class KItemListWidgetInformant;
 class KItemListWidgetCreatorBase;

-class KItemListViewCreatorBase;

 class QTimer;
 
 /**
 class QTimer;
 
 /**


@@ -60,7 +58,7 @@ class QTimer;
  * @see KItemListWidget
  * @see KItemModelBase
  */
  * @see KItemListWidget
  * @see KItemModelBase
  */

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

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -68,8 +66,8 @@ class LIBDOLPHINPRIVATE_EXPORT KItemListView : public QGraphicsWidget
     Q_PROPERTY(qreal itemOffset READ itemOffset WRITE setItemOffset)
 
 public:
     Q_PROPERTY(qreal itemOffset READ itemOffset WRITE setItemOffset)
 
 public:

-    KItemListView(QGraphicsWidget* parent = 0);
-    virtual ~KItemListView();
+    explicit KItemListView(QGraphicsWidget* parent = nullptr);
+    ~KItemListView() override;

 
     /**
      * Offset of the scrollbar that represents the scroll-orientation
 
     /**
      * Offset of the scrollbar that represents the scroll-orientation


@@ -155,14 +153,13 @@ public:
 
     /**
      * @return The basic size of all items. The size of an item may be larger than
 
     /**
      * @return The basic size of all items. The size of an item may be larger than

-     *         the basic size (see KItemListView::itemSizeHint() and KItemListView::itemRect()).
+     *         the basic size (see KItemListView::itemRect()).

      */
     QSizeF itemSize() const;
 
     const KItemListStyleOption& styleOption() const;
 
      */
     QSizeF itemSize() const;
 
     const KItemListStyleOption& styleOption() const;
 

-    /** @reimp */
-    virtual void setGeometry(const QRectF& rect);
+    void setGeometry(const QRectF& rect) override;

 
     /**
      * @return The page step which should be used by the vertical scroll bar.
 
     /**
      * @return The page step which should be used by the vertical scroll bar.


@@ -180,6 +177,7 @@ public:
     int itemAt(const QPointF& pos) const;
     bool isAboveSelectionToggle(int index, const QPointF& pos) const;
     bool isAboveExpansionToggle(int index, const QPointF& pos) const;
     int itemAt(const QPointF& pos) const;
     bool isAboveSelectionToggle(int index, const QPointF& pos) const;
     bool isAboveExpansionToggle(int index, const QPointF& pos) const;

+    bool isAboveText(int index, const QPointF& pos) const;

 
     /**
      * @return Index of the first item that is at least partly visible.
 
     /**
      * @return Index of the first item that is at least partly visible.


@@ -194,18 +192,19 @@ public:
     int lastVisibleIndex() const;
 
     /**
     int lastVisibleIndex() const;
 
     /**

-     * @return Calculates the required size for all items in the model.
-     *         It might be larger than KItemListView::itemSize().
-     *         In this case the layout grid will be stretched to assure an
-     *         unclipped item.
-     *         NOTE: the logical height (width) is actually the
-     *         width (height) if the scroll orientation is Qt::Vertical!
+     * Calculates the required size for all items in the model.
+     * It might be larger than KItemListView::itemSize().
+     * In this case the layout grid will be stretched to assure an
+     * unclipped item.
+     *
+     * @note the logical height (width) is actually the
+     * width (height) if the scroll orientation is Qt::Vertical!

      */
     void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) const;
 
     /**
      * If set to true, items having child-items can be expanded to show the child-items as
      */
     void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) const;
 
     /**
      * If set to true, items having child-items can be expanded to show the child-items as

-     * part of the view. Per default the expanding of items is is disabled. If expanding of
+     * part of the view. Per default the expanding of items is disabled. If expanding of

      * items is enabled, the methods KItemModelBase::setExpanded(), KItemModelBase::isExpanded(),
      * KItemModelBase::isExpandable() and KItemModelBase::expandedParentsCount()
      * must be reimplemented. The view-implementation
      * items is enabled, the methods KItemModelBase::setExpanded(), KItemModelBase::isExpanded(),
      * KItemModelBase::isExpandable() and KItemModelBase::expandedParentsCount()
      * must be reimplemented. The view-implementation


@@ -224,7 +223,7 @@ public:
     /**
      * @return The context rectangle of the item relative to the top/left of
      *         the currently visible area (see KItemListView::offset()). The
     /**
      * @return The context rectangle of the item relative to the top/left of
      *         the currently visible area (see KItemListView::offset()). The

-     *         context rectangle is defined by by the united rectangle of
+     *         context rectangle is defined by the united rectangle of

      *         the icon rectangle and the text rectangle (see KItemListWidget::iconRect()
      *         and KItemListWidget::textRect()) and is useful as reference for e.g. aligning
      *         a tooltip or a context-menu for an item. Note that a context rectangle will
      *         the icon rectangle and the text rectangle (see KItemListWidget::iconRect()
      *         and KItemListWidget::textRect()) and is useful as reference for e.g. aligning
      *         a tooltip or a context-menu for an item. Note that a context rectangle will


@@ -280,10 +279,7 @@ public:
      */
     void editRole(int index, const QByteArray& role);
 
      */
     void editRole(int index, const QByteArray& role);
 

-    /**
-     * @reimp
-     */
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;

 
 signals:
     void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
 
 signals:
     void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);


@@ -323,7 +319,7 @@ signals:
     void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
 
 protected:
     void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
 
 protected:

-    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;

     void setItemSize(const QSizeF& size);
     void setStyleOption(const KItemListStyleOption& option);
 
     void setItemSize(const QSizeF& size);
     void setStyleOption(const KItemListStyleOption& option);
 


@@ -380,13 +376,13 @@ protected:
     virtual void onTransactionBegin();
     virtual void onTransactionEnd();
 
     virtual void onTransactionBegin();
     virtual void onTransactionEnd();
 

-    virtual bool event(QEvent* event);
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent* event);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
-    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event);
-    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event);
-    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event);
-    virtual void dropEvent(QGraphicsSceneDragDropEvent* event);
+    bool event(QEvent* event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
+    void dragEnterEvent(QGraphicsSceneDragDropEvent* event) override;
+    void dragMoveEvent(QGraphicsSceneDragDropEvent* event) override;
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) override;
+    void dropEvent(QGraphicsSceneDragDropEvent* event) override;

 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 
 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 


@@ -647,7 +643,7 @@ private:
 
     /**
      * Shows a drop-indicator between items dependent on the given
 
     /**
      * Shows a drop-indicator between items dependent on the given

-     * cursor position. The cursor position is relative the the upper left
+     * cursor position. The cursor position is relative to the upper left

      * edge of the view.
      * @return Index of the item where the dropping is done. An index of -1
      *         indicates that the item has been dropped after the last item.
      * edge of the view.
      * @return Index of the item where the dropping is done. An index of -1
      *         indicates that the item has been dropped after the last item.


@@ -774,7 +770,7 @@ private:
  * KItemListWidgetCreatorBase and KItemListGroupHeaderCreatorBase.
  * @internal
  */
  * KItemListWidgetCreatorBase and KItemListGroupHeaderCreatorBase.
  * @internal
  */

-class LIBDOLPHINPRIVATE_EXPORT KItemListCreatorBase
+class DOLPHIN_EXPORT KItemListCreatorBase

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


@@ -798,10 +794,10 @@ private:
  * expensive instantiations and deletions of KItemListWidgets by recycling existing widget
  * instances.
  */
  * expensive instantiations and deletions of KItemListWidgets by recycling existing widget
  * instances.
  */

-class LIBDOLPHINPRIVATE_EXPORT KItemListWidgetCreatorBase : public KItemListCreatorBase
+class DOLPHIN_EXPORT KItemListWidgetCreatorBase : public KItemListCreatorBase

 {
 public:
 {
 public:

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

 
     virtual KItemListWidget* create(KItemListView* view) = 0;
 
 
     virtual KItemListWidget* create(KItemListView* view) = 0;
 


@@ -822,15 +818,15 @@ class KItemListWidgetCreator : public KItemListWidgetCreatorBase
 {
 public:
     KItemListWidgetCreator();
 {
 public:
     KItemListWidgetCreator();

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

 
 

-    virtual KItemListWidget* create(KItemListView* view);
+    KItemListWidget* create(KItemListView* view) override;

 
 

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

 
 

-    virtual qreal preferredRoleColumnWidth(const QByteArray& role,
+    qreal preferredRoleColumnWidth(const QByteArray& role,

                                            int index,
                                            int index,

-                                           const KItemListView* view) const;
+                                           const KItemListView* view) const override;

 private:
     KItemListWidgetInformant* m_informant;
 };
 private:
     KItemListWidgetInformant* m_informant;
 };


@@ -880,10 +876,10 @@ qreal KItemListWidgetCreator<T>::preferredRoleColumnWidth(const QByteArray& role
  * The intention of the group-header creator is to prevent repetitive and expensive instantiations and
  * deletions of KItemListGroupHeaders by recycling existing header instances.
  */
  * The intention of the group-header creator is to prevent repetitive and expensive instantiations and
  * deletions of KItemListGroupHeaders by recycling existing header instances.
  */

-class LIBDOLPHINPRIVATE_EXPORT KItemListGroupHeaderCreatorBase : public KItemListCreatorBase
+class DOLPHIN_EXPORT KItemListGroupHeaderCreatorBase : public KItemListCreatorBase

 {
 public:
 {
 public:

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

     virtual KItemListGroupHeader* create(KItemListView* view) = 0;
     virtual void recycle(KItemListGroupHeader* header);
 };
     virtual KItemListGroupHeader* create(KItemListView* view) = 0;
     virtual void recycle(KItemListGroupHeader* header);
 };


@@ -892,8 +888,8 @@ template <class T>
 class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase
 {
 public:
 class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase
 {
 public:

-    virtual ~KItemListGroupHeaderCreator();
-    virtual KItemListGroupHeader* create(KItemListView* view);
+    ~KItemListGroupHeaderCreator() override;
+    KItemListGroupHeader* create(KItemListView* view) override;

 };
 
 template <class T>
 };
 
 template <class T>