fix popup not hide when right click on sys tray

Change-Id: I7a8a0369501072625d6ca385840f5a9aec6a7c82

frame/item/dockitem.cpp

@@ -201,6 +201,11 @@ void DockItem::showHoverTips()
     if (PopupWindow->isVisible() && PopupWindow->model())
         return;
 
+    // if not in geometry area
+    const QRect r(topleftPoint(), size());
+    if (!r.contains(QCursor::pos()))
+        return;
+
     QWidget * const content = popupTips();
     if (!content)
         return;
@@ -276,14 +281,9 @@ QWidget *DockItem::popupTips()
     return nullptr;
 }
 
-const QPoint DockItem::popupMarkPoint()
+const QPoint DockItem::popupMarkPoint() const
 {
-    QPoint p;
-    QWidget *w = this;
-    do {
-        p += w->pos();
-        w = qobject_cast<QWidget *>(w->parent());
-    } while (w);
+    QPoint p(topleftPoint());
 
     const QRect r = rect();
     const int offset = 2;
@@ -298,6 +298,18 @@ const QPoint DockItem::popupMarkPoint()
     return p;
 }
 
+const QPoint DockItem::topleftPoint() const
+{
+    QPoint p;
+    const QWidget *w = this;
+    do {
+        p += w->pos();
+        w = qobject_cast<QWidget *>(w->parent());
+    } while (w);
+
+    return p;
+}
+
 void DockItem::hidePopup()
 {
     m_popupTipsDelayTimer->stop();

frame/item/dockitem.h

@@ -72,7 +72,8 @@ protected:
     void leaveEvent(QEvent *e);
 
     const QRect perfectIconRect() const;
-    const QPoint popupMarkPoint();
+    const QPoint popupMarkPoint() const;
+    const QPoint topleftPoint() const;
 
     void hidePopup();
     void popupWindowAccept();

frame/item/pluginsitem.cpp

@@ -112,10 +112,11 @@ void PluginsItem::refershIcon()
 
 void PluginsItem::mousePressEvent(QMouseEvent *e)
 {
-    QWidget::mousePressEvent(e);
-
     if (e->button() == Qt::LeftButton)
         MousePressPoint = e->pos();
+    else if (e->button() == Qt::RightButton)
+        if (!PopupWindow->isModal() && PopupWindow->isVisible())
+            hidePopup();
 }
 
 void PluginsItem::mouseMoveEvent(QMouseEvent *e)

plugins/sound/sounditem.cpp

@@ -126,6 +126,7 @@ void SoundItem::mousePressEvent(QMouseEvent *e)
     const QPoint p(e->pos() - rect().center());
     if (p.manhattanLength() < std::min(width(), height()) * 0.8 * 0.5)
     {
+        e->accept();
         emit requestContextMenu();
         return;
     }

plugins/sound/soundplugin.cpp

@@ -46,7 +46,7 @@ void SoundPlugin::init(PluginProxyInterface *proxyInter)
     m_proxyInter = proxyInter;
 
     m_soundItem = new SoundItem;
-    connect(m_soundItem, &SoundItem::requestContextMenu, [this] {m_proxyInter->requestContextMenu(this, QString());});
+    connect(m_soundItem, &SoundItem::requestContextMenu, [this] { m_proxyInter->requestContextMenu(this, QString()); });
 
     if (m_settings.value(STATE_KEY, true).toBool())
         m_proxyInter->itemAdded(this, QString());

plugins/system-tray/fashiontrayitem.cpp

@@ -116,7 +116,7 @@ void FashionTrayItem::mousePressEvent(QMouseEvent *e)
     if (dis.manhattanLength() > std::min(width(), height()) / 2 * 0.8)
         return QWidget::mousePressEvent(e);
 
-    if (e->button() != Qt::RightButton)
+//    if (e->button() != Qt::RightButton)
         QWidget::mousePressEvent(e);
 
     m_pressPoint = e->pos();

plugins/system-tray/systemtrayplugin.cpp

@@ -75,7 +75,13 @@ void SystemTrayPlugin::displayModeChanged(const Dock::DisplayMode mode)
 QWidget *SystemTrayPlugin::itemWidget(const QString &itemKey)
 {
     if (itemKey == FASHION_MODE_ITEM)
+    {
+        // refresh active tray
+        if (!m_fashionItem->activeTray())
+            m_fashionItem->setActiveTray(m_trayList.first());
+
         return m_fashionItem;
+    }
 
     const quint32 trayWinId = itemKey.toUInt();
 
@@ -210,8 +216,9 @@ void SystemTrayPlugin::trayRemoved(const quint32 winId)
     if (m_trayApplet->isVisible())
         updateTipsContent();
 
-    if (m_fashionItem->activeTray() != widget)
+    if (m_fashionItem->activeTray() && m_fashionItem->activeTray() != widget)
         return;
+
     // reset active tray
     if (m_trayList.values().isEmpty())
     {

plugins/system-tray/traywidget.cpp

@@ -155,24 +155,21 @@ void TrayWidget::paintEvent(QPaintEvent *e)
 
 void TrayWidget::mousePressEvent(QMouseEvent *e)
 {
+    e->accept();
     const QPoint point(e->pos() - rect().center());
     if (point.manhattanLength() > 24)
-        return QWidget::mousePressEvent(e);
+        e->ignore();
 
-    m_pressPoint = e->pos();
+    QWidget::mousePressEvent(e);
 }
 
 void TrayWidget::mouseReleaseEvent(QMouseEvent *e)
 {
-    QWidget::mouseReleaseEvent(e);
-
     const QPoint point(e->pos() - rect().center());
     if (point.manhattanLength() > 24)
         return;
 
-    const QPoint distance = e->pos() - m_pressPoint;
-    if (distance.manhattanLength() > DRAG_THRESHOLD)
-        return;
+    e->accept();
 
     QPoint globalPos = QCursor::pos();
     uint8_t buttonIndex = XCB_BUTTON_INDEX_1;

plugins/system-tray/traywidget.h

@@ -69,7 +69,7 @@ private:
 
     QTimer *m_updateTimer;
     QTimer *m_ignoreRepeat;
-    QPoint m_pressPoint;
+//    QPoint m_pressPoint;
 };
 
 #endif // TRAYWIDGET_H