From b860927629b3d99ea05fa81b68a8c8990e03311d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= <sbw@sbw.so>
Date: Tue, 2 May 2017 11:10:54 +0800
Subject: [PATCH] add hide signal to control preview window visible

Change-Id: I0ecdf1e215c5fb724773a5a718c0d04d7c13f2c8
---
 frame/item/appitem.cpp                     | 2 +-
 frame/item/components/previewcontainer.cpp | 1 +
 frame/item/components/previewcontainer.h   | 1 +
 frame/item/components/previewwidget.cpp    | 1 +
 frame/item/components/previewwidget.h      | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp
index 47ac42f8e..9a634595f 100644
--- a/frame/item/appitem.cpp
+++ b/frame/item/appitem.cpp
@@ -76,7 +76,7 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
     connect(m_appPreviewTips, &PreviewContainer::requestActivateWindow, this, &AppItem::requestActivateWindow, Qt::QueuedConnection);
     connect(m_appPreviewTips, &PreviewContainer::requestPreviewWindow, this, &AppItem::requestPreviewWindow, Qt::QueuedConnection);
     connect(m_appPreviewTips, &PreviewContainer::requestCancelPreview, this, &AppItem::requestCancelPreview, Qt::QueuedConnection);
-    connect(m_appPreviewTips, &PreviewContainer::requestCancelPreview, this, &AppItem::hidePopup);
+    connect(m_appPreviewTips, &PreviewContainer::requestHidePreview, this, &AppItem::hidePopup, Qt::QueuedConnection);
 
     updateTitle();
     refershIcon();
diff --git a/frame/item/components/previewcontainer.cpp b/frame/item/components/previewcontainer.cpp
index 4d71f70b2..0ca53cd78 100644
--- a/frame/item/components/previewcontainer.cpp
+++ b/frame/item/components/previewcontainer.cpp
@@ -33,6 +33,7 @@ void PreviewContainer::setWindowInfos(const WindowDict &infos)
         connect(w, &PreviewWidget::requestActivateWindow, this, &PreviewContainer::requestActivateWindow);
         connect(w, &PreviewWidget::requestPreviewWindow, this, &PreviewContainer::requestPreviewWindow);
         connect(w, &PreviewWidget::requestCancelPreview, this, &PreviewContainer::requestCancelPreview);
+        connect(w, &PreviewWidget::requestHidePreview, this, &PreviewContainer::requestHidePreview);
 
         m_windowListLayout->addWidget(w);
     }
diff --git a/frame/item/components/previewcontainer.h b/frame/item/components/previewcontainer.h
index 9b49b4115..5af7f9f75 100644
--- a/frame/item/components/previewcontainer.h
+++ b/frame/item/components/previewcontainer.h
@@ -18,6 +18,7 @@ signals:
     void requestActivateWindow(const WId wid) const;
     void requestPreviewWindow(const WId wid) const;
     void requestCancelPreview() const;
+    void requestHidePreview() const;
 
 public:
     void setWindowInfos(const WindowDict &infos);
diff --git a/frame/item/components/previewwidget.cpp b/frame/item/components/previewwidget.cpp
index 03af1cd11..f18a9121d 100644
--- a/frame/item/components/previewwidget.cpp
+++ b/frame/item/components/previewwidget.cpp
@@ -158,6 +158,7 @@ void PreviewWidget::mouseReleaseEvent(QMouseEvent *e)
 
     QWidget::mouseReleaseEvent(e);
 
+    emit requestHidePreview();
     emit requestCancelPreview();
     emit requestActivateWindow(m_wid);
 }
diff --git a/frame/item/components/previewwidget.h b/frame/item/components/previewwidget.h
index 4a8385e75..b92e70f1d 100644
--- a/frame/item/components/previewwidget.h
+++ b/frame/item/components/previewwidget.h
@@ -19,6 +19,7 @@ signals:
     void requestActivateWindow(const WId wid) const;
     void requestPreviewWindow(const WId wid) const;
     void requestCancelPreview() const;
+    void requestHidePreview() const;
 
 private slots:
     void refershImage();