pass get image for unchanged window

Change-Id: Id71b3b01aa783397b7a0b7a8d797bbad602af9c0

frame/item/appitem.cpp

@@ -43,7 +43,7 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
 
     setAccessibleName(m_itemEntry->name());
     setAcceptDrops(true);
-    setMouseTracking(true);
+//    setMouseTracking(true);
     setLayout(centralLayout);
 
     m_itemView->setScene(m_itemScene);
@@ -71,7 +71,7 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
     m_appPreviewTips->setVisible(false);
 
     connect(m_itemEntry, &DBusDockEntry::ActiveChanged, this, &AppItem::activeChanged);
-    connect(m_itemEntry, &DBusDockEntry::TitlesChanged, this, &AppItem::updateTitle);
+    connect(m_itemEntry, &DBusDockEntry::TitlesChanged, this, &AppItem::updateTitle, Qt::QueuedConnection);
     connect(m_itemEntry, &DBusDockEntry::IconChanged, this, &AppItem::refershIcon);
     connect(m_itemEntry, &DBusDockEntry::ActiveChanged, this, static_cast<void (AppItem::*)()>(&AppItem::update));
 
@@ -328,8 +328,8 @@ void AppItem::mouseMoveEvent(QMouseEvent *e)
     e->accept();
 
     // handle preview
-    if (e->buttons() == Qt::NoButton)
+//    if (e->buttons() == Qt::NoButton)
-        return showPreview();
+//        return showPreview();
 
     // handle drag
     if (e->buttons() != Qt::LeftButton)
@@ -393,6 +393,14 @@ void AppItem::dropEvent(QDropEvent *e)
     m_itemEntry->HandleDragDrop(uriList);
 }
 
+void AppItem::showHoverTips()
+{
+    if (!m_titles.isEmpty())
+        return showPreview();
+
+    DockItem::showHoverTips();
+}
+
 void AppItem::invokedMenuItem(const QString &itemId, const bool checked)
 {
     Q_UNUSED(checked);
@@ -450,8 +458,6 @@ void AppItem::startDrag()
 void AppItem::updateTitle()
 {
     m_titles = m_itemEntry->titles();
-
-    // TODO: optimize
     m_appPreviewTips->setWindowInfos(m_titles);
 
     update();
@@ -485,18 +491,19 @@ void AppItem::showPreview()
         return;
 
     // test cursor position
-    const QRect r = rect();
+//    const QRect r = rect();
-    const QPoint p = mapFromGlobal(QCursor::pos());
+//    const QPoint p = mapFromGlobal(QCursor::pos());
 
-    switch (DockPosition)
+//    switch (DockPosition)
-    {
+//    {
-    case Top:       if (p.y() != r.top())       return;     break;
+//    case Top:       if (p.y() != r.top())       return;     break;
-    case Left:      if (p.x() != r.left())      return;     break;
+//    case Left:      if (p.x() != r.left())      return;     break;
-    case Right:     if (p.x() != r.right())     return;     break;
+//    case Right:     if (p.x() != r.right())     return;     break;
-    case Bottom:    if (p.y() != r.bottom())    return;     break;
+//    case Bottom:    if (p.y() != r.bottom())    return;     break;
-    default:        return;
+//    default:        return;
-    }
+//    }
 
+    m_appPreviewTips->setWindowInfos(m_titles);
     m_appPreviewTips->updateLayoutDirection(DockPosition);
 
     qApp->processEvents();

frame/item/appitem.h

@@ -42,6 +42,7 @@ private:
     void dragMoveEvent(QDragMoveEvent *e);
     void dropEvent(QDropEvent *e);
 
+    void showHoverTips();
     void invokedMenuItem(const QString &itemId, const bool checked);
     const QString contextMenu() const;
     QWidget *popupTips();

frame/item/components/previewcontainer.cpp

@@ -6,25 +6,24 @@
 #include <QDebug>
 
 PreviewContainer::PreviewContainer(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent),
+
+      m_mouseLeaveTimer(new QTimer(this))
 {
     m_windowListLayout = new QBoxLayout(QBoxLayout::LeftToRight);
     m_windowListLayout->setMargin(5);
     m_windowListLayout->setSpacing(3);
 
+    m_mouseLeaveTimer->setSingleShot(true);
+    m_mouseLeaveTimer->setInterval(100);
+
     setLayout(m_windowListLayout);
-    setMouseTracking(true);
+
+    connect(m_mouseLeaveTimer, &QTimer::timeout, this, &PreviewContainer::checkMouseLeave, Qt::QueuedConnection);
 }
 
 void PreviewContainer::setWindowInfos(const WindowDict &infos)
 {
-    // TODO: optimize
-    while (QLayoutItem *item = m_windowListLayout->takeAt(0))
-    {
-        item->widget()->deleteLater();
-        delete item;
-    }
-
     if (infos.isEmpty())
     {
         emit requestCancelPreview();
@@ -33,8 +32,26 @@ void PreviewContainer::setWindowInfos(const WindowDict &infos)
         return;
     }
 
+    QList<WId> removedWindows;
+
+    // remove desroyed window
+    for (auto it(m_windows.cbegin()); it != m_windows.cend(); ++it)
+    {
+        if (infos.contains(it.key()))
+            continue;
+
+        removedWindows << it.key();
+        m_windowListLayout->removeWidget(it.value());
+        it.value()->deleteLater();
+    }
+    for (auto id : removedWindows)
+        m_windows.remove(id);
+
     for (auto it(infos.cbegin()); it != infos.cend(); ++it)
     {
+        if (m_windows.contains(it.key()))
+            continue;
+
         PreviewWidget *w = new PreviewWidget(it.key());
         w->setTitle(it.value());
 
@@ -44,11 +61,9 @@ void PreviewContainer::setWindowInfos(const WindowDict &infos)
         connect(w, &PreviewWidget::requestHidePreview, this, &PreviewContainer::requestHidePreview);
 
         m_windowListLayout->addWidget(w);
+        m_windows.insert(it.key(), w);
     }
 
-    if (!isVisible())
-        return;
-
     // update geometry
     QMetaObject::invokeMethod(this, "updateContainerSize", Qt::QueuedConnection);
 }
@@ -73,13 +88,25 @@ void PreviewContainer::leaveEvent(QEvent *e)
 {
     QWidget::leaveEvent(e);
 
-    const QPoint p = mapFromGlobal(QCursor::pos()) + pos();
+    m_mouseLeaveTimer->start();
+}
 
-    if (!rect().contains(p))
+void PreviewContainer::enterEvent(QEvent *e)
-        emit requestCancelPreview();
+{
+    QWidget::enterEvent(e);
+
+    m_mouseLeaveTimer->stop();
 }
 
 void PreviewContainer::updateContainerSize()
 {
     resize(sizeHint());
 }
+
+void PreviewContainer::checkMouseLeave()
+{
+    const QPoint p = mapFromGlobal(QCursor::pos());
+
+    if (!rect().contains(p))
+        emit requestCancelPreview();
+}

frame/item/components/previewcontainer.h

@@ -28,12 +28,18 @@ public slots:
 
 protected:
     void leaveEvent(QEvent *e);
+    void enterEvent(QEvent *e);
 
 private slots:
     void updateContainerSize();
+    void checkMouseLeave();
 
 private:
     QBoxLayout *m_windowListLayout;
+
+    QTimer *m_mouseLeaveTimer;
+
+    QMap<WId, QWidget *> m_windows;
 };
 
 #endif // PREVIEWCONTAINER_H

frame/item/components/previewwidget.cpp

@@ -17,6 +17,8 @@ PreviewWidget::PreviewWidget(const WId wid, QWidget *parent)
     : QWidget(parent),
 
       m_wid(wid),
+      m_mouseEnterTimer(new QTimer(this)),
+
       m_hovered(false)
 {
     m_closeButton = new QPushButton;
@@ -28,6 +30,9 @@ PreviewWidget::PreviewWidget(const WId wid, QWidget *parent)
     m_droppedDelay->setSingleShot(true);
     m_droppedDelay->setInterval(100);
 
+    m_mouseEnterTimer->setInterval(200);
+    m_mouseEnterTimer->setSingleShot(true);
+
     QVBoxLayout *centralLayout = new QVBoxLayout;
     centralLayout->setSpacing(0);
     centralLayout->setMargin(0);
@@ -39,6 +44,9 @@ PreviewWidget::PreviewWidget(const WId wid, QWidget *parent)
     setAcceptDrops(true);
 
     connect(m_closeButton, &QPushButton::clicked, this, &PreviewWidget::closeWindow);
+    connect(m_mouseEnterTimer, &QTimer::timeout, this, &PreviewWidget::showPreview, Qt::QueuedConnection);
+
+    QTimer::singleShot(1, this, &PreviewWidget::refreshImage);
 }
 
 void PreviewWidget::setTitle(const QString &title)
@@ -48,7 +56,7 @@ void PreviewWidget::setTitle(const QString &title)
     update();
 }
 
-void PreviewWidget::refershImage()
+void PreviewWidget::refreshImage()
 {
     const auto display = QX11Info::display();
 
@@ -83,12 +91,9 @@ void PreviewWidget::closeWindow()
     XFlush(display);
 }
 
-void PreviewWidget::setVisible(const bool visible)
+void PreviewWidget::showPreview()
 {
-    QWidget::setVisible(visible);
+    emit requestPreviewWindow(m_wid);
-
-    if (visible)
-        QTimer::singleShot(1, this, &PreviewWidget::refershImage);
 }
 
 void PreviewWidget::paintEvent(QPaintEvent *e)
@@ -133,18 +138,18 @@ void PreviewWidget::enterEvent(QEvent *e)
 
     m_hovered = true;
     m_closeButton->setVisible(true);
+    m_mouseEnterTimer->start();
 
     update();
 
     QWidget::enterEvent(e);
-
-    emit requestPreviewWindow(m_wid);
 }
 
 void PreviewWidget::leaveEvent(QEvent *e)
 {
     m_hovered = false;
     m_closeButton->setVisible(false);
+    m_mouseEnterTimer->stop();
 
     update();
 

frame/item/components/previewwidget.h

@@ -22,9 +22,9 @@ signals:
     void requestHidePreview() const;
 
 private slots:
-    void refershImage();
+    void refreshImage();
     void closeWindow();
-    void setVisible(const bool visible);
+    void showPreview();
 
 private:
     void paintEvent(QPaintEvent *e);
@@ -43,6 +43,7 @@ private:
     QPushButton *m_closeButton;
 
     QTimer *m_droppedDelay;
+    QTimer *m_mouseEnterTimer;
 
     bool m_hovered;
 };