Move isHover to drawBackground/drawForeground, at same, remove drawHo…

…ver interface.

Draw hover code should implement in drawBackground/drawForeground interfaces by application author.

Change-Id: If6fa48fc227ecbe426177e92922d455268c6d748

examples/dwidget-examples/collections/multilistitem.cpp

@@ -32,7 +32,7 @@ bool MultiListItem::sameAs(DSimpleListItem *item)
     return artist == (static_cast<MultiListItem*>(item))->artist && song == (static_cast<MultiListItem*>(item))->song && length == (static_cast<MultiListItem*>(item))->length;
 }
 
-void MultiListItem::drawBackground(QRect rect, QPainter *painter, int index, bool isSelect)
+void MultiListItem::drawBackground(QRect rect, QPainter *painter, int index, bool isSelect, bool isHover)
 {
     QPainterPath path;
     path.addRect(QRectF(rect));
@@ -45,7 +45,7 @@ void MultiListItem::drawBackground(QRect rect, QPainter *painter, int index, boo
     }
 }
 
-void MultiListItem::drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect)
+void MultiListItem::drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect, bool isHover)
 {
     int padding = 10;
     painter->setOpacity(1);
@@ -94,8 +94,3 @@ bool MultiListItem::sortByLength(const DSimpleListItem *item1, const DSimpleList
 
     return descendingSort ? sortOrder : !sortOrder;
 }
-
-void MultiListItem::drawHover(QRect rect, QPainter *painter)
-{
-
-}

examples/dwidget-examples/collections/multilistitem.h

@@ -30,9 +30,8 @@ class MultiListItem : public DSimpleListItem
     MultiListItem(QString artistName, QString songName, QString songLength);
 
     bool sameAs(DSimpleListItem *item);
-    void drawBackground(QRect rect, QPainter *painter, int index, bool isSelect);
-    void drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect);
-    void drawHover(QRect rect, QPainter *painter);
+    void drawBackground(QRect rect, QPainter *painter, int index, bool isSelect, bool isHover);
+    void drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect, bool isHover);
 
     static bool sortByArtist(const DSimpleListItem *item1, const DSimpleListItem *item2, bool descendingSort);
     static bool sortBySong(const DSimpleListItem *item1, const DSimpleListItem *item2, bool descendingSort);

examples/dwidget-examples/collections/singlelistitem.cpp

@@ -30,7 +30,7 @@ bool SingleListItem::sameAs(DSimpleListItem *item)
     return name == (static_cast<SingleListItem*>(item))->name;
 }
 
-void SingleListItem::drawBackground(QRect rect, QPainter *painter, int index, bool isSelect)
+void SingleListItem::drawBackground(QRect rect, QPainter *painter, int index, bool isSelect, bool isHover)
 {
     QPainterPath path;
     path.addRect(QRectF(rect));
@@ -43,7 +43,7 @@ void SingleListItem::drawBackground(QRect rect, QPainter *painter, int index, bo
     }
 }
 
-void SingleListItem::drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect)
+void SingleListItem::drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect, bool isHover)
 {
     painter->setOpacity(1);
     if (isSelect) {
@@ -56,7 +56,3 @@ void SingleListItem::drawForeground(QRect rect, QPainter *painter, int column, i
     painter->drawText(QRect(rect.x() + padding, rect.y(), rect.width() - padding * 2, rect.height()), Qt::AlignLeft | Qt::AlignVCenter, name);
 }
 
-void SingleListItem::drawHover(QRect rect, QPainter *painter)
-{
-
-}

examples/dwidget-examples/collections/singlelistitem.h

@@ -30,9 +30,8 @@ class SingleListItem : public DSimpleListItem
     SingleListItem(QString itemName);
 
     bool sameAs(DSimpleListItem *item);
-    void drawBackground(QRect rect, QPainter *painter, int index, bool isSelect);
-    void drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect);
-    void drawHover(QRect rect, QPainter *painter);
+    void drawBackground(QRect rect, QPainter *painter, int index, bool isSelect, bool isHover);
+    void drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect, bool isHover);
 
     QString name;
 };	

src/widgets/dsimplelistitem.h

@@ -54,8 +54,9 @@ class LIBDTKWIDGETSHARED_EXPORT DSimpleListItem : public QObject
      * @painter the painter used to draw anything you want
      * @index the index of DSimpleListItem, you can draw different rows effect based on the index, such as the zebra crossing
      * @isSelect current item is selected, you can draw selected effect under content when isSelect is true
+     * @isHover current item is hovered, you can draw hover effect under content when isHover is true
      */
-    virtual void drawBackground(QRect rect, QPainter *painter, int index, bool isSelect)=0;
+    virtual void drawBackground(QRect rect, QPainter *painter, int index, bool isSelect, bool isHover)=0;
 
     /* 
      * The interface function that used to draw foreground of DSimpleListItem.
@@ -65,17 +66,9 @@ class LIBDTKWIDGETSHARED_EXPORT DSimpleListItem : public QObject
      * @column the column of DSimpleListItem, you can draw different column content based on the column index
      * @index the index of DSimpleListItem, you can draw different rows effect based on the index, such as the zebra crossing
      * @isSelect current item is selected, you can draw selected effect under content when isSelect is true
+     * @isHover current item is hovered, you can draw hover effect under content when isHover is true
      */
-    virtual void drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect)=0;
-
-
-    /* 
-     * The interface function that used to draw hover effect.
-     * 
-     * @rect column corresponding to the drawing of the rectangular area
-     * @painter the painter used to draw anything you want
-     */
-    virtual void drawHover(QRect rect, QPainter *painter)=0;
+    virtual void drawForeground(QRect rect, QPainter *painter, int column, int index, bool isSelect, bool isHover)=0;
 };
 
 DWIDGET_END_NAMESPACE

src/widgets/dsimplelistview.cpp

@@ -1139,22 +1139,27 @@ void DSimpleListView::paintEvent(QPaintEvent *)
 
             // Draw item backround.
             bool isSelect = d->selectionItems->contains(item);
+            bool isHover = d->drawHover && d->drawHoverItem != NULL && item->sameAs(d->drawHoverItem);
             painter.save();
-            item->drawBackground(QRect(0, renderY + rowCounter * d->rowHeight - d->renderOffset, rect().width(), d->rowHeight), &painter, rowCounter, isSelect);
+            item->drawBackground(QRect(0, renderY + rowCounter * d->rowHeight - d->renderOffset, rect().width(), d->rowHeight), 
+                                 &painter, 
+                                 rowCounter, 
+                                 isSelect, 
+                                 isHover);
             painter.restore();
-
-            // Draw hover effect.
-            if (d->drawHover && d->drawHoverItem != NULL && item->sameAs(d->drawHoverItem)) {
-                item->drawHover(QRect(0, renderY + rowCounter * d->rowHeight - d->renderOffset, rect().width(), d->rowHeight), &painter);
-            }
-
+
             // Draw item foreground.
             int columnCounter = 0;
             int columnRenderX = 0;
             for (int renderWidth:renderWidths) {
                 if (renderWidth > 0) {
                     painter.save();
-                    item->drawForeground(QRect(columnRenderX, renderY + rowCounter * d->rowHeight - d->renderOffset, renderWidth, d->rowHeight), &painter, columnCounter, rowCounter, isSelect);
+                    item->drawForeground(QRect(columnRenderX, renderY + rowCounter * d->rowHeight - d->renderOffset, renderWidth, d->rowHeight), 
+                                         &painter, 
+                                         columnCounter, 
+                                         rowCounter, 
+                                         isSelect, 
+                                         isHover);
                     painter.restore();
 
                     columnRenderX += renderWidth;

src/widgets/dsimplelistview.h

@@ -110,7 +110,7 @@ class LIBDTKWIDGETSHARED_EXPORT DSimpleListView : public QWidget, public DTK_COR
     /*
      * Set whether display hover effect.
      *
-     * @enableHoverEffect draw hover effect by call item's drawHover interface, default is false.
+     * @enableHoverEffect draw hover effect by call item's drawBackground/drawForeground interface, default is false.
      */
     void setHoverEffect(bool enableHoverEffect);