copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 26 insertions, 8 deletions

diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp
index 4113b53a4..5667d8637 100644
--- a/src/plugins/General/statusicon/qmmptrayicon.cpp
+++ b/src/plugins/General/statusicon/qmmptrayicon.cpp
@@ -21,11 +21,12 @@
 #include <QEvent>
 #include <QWheelEvent>
 #include <QMouseEvent>
-#include <QApplication>
+#include <QGuiApplication>
+#include <QWindow>
 #include <qmmp/soundcore.h>
 
 #include "qmmptrayicon.h"
-#ifdef Q_WS_X11
+#ifdef QMMP_WS_X11
 #include "statusiconpopupwidget.h"
 #endif
 
@@ -41,19 +42,24 @@ QmmpTrayIcon::~QmmpTrayIcon()
 
 void QmmpTrayIcon::setToolTip(const QString &tip)
 {
-#ifdef Q_WS_X11
-    m_message = tip;
-    if(m_popupWidget)
-        showToolTip();
+#ifdef QMMP_WS_X11
+    if(hasToolTipEvent())
+    {
+        m_message = tip;
+        if(m_popupWidget)
+            showToolTip();
+    }
+    else
+        QSystemTrayIcon::setToolTip(tip);
 #else
     QSystemTrayIcon::setToolTip(tip);
 #endif
 }
 
-#ifdef Q_WS_X11
+#ifdef QMMP_WS_X11
 bool QmmpTrayIcon::event(QEvent *e)
 {
-    if (e->type() == QEvent::Wheel)
+    if (e->type() == QEvent::Wheel )
     {
         wheelEvent((QWheelEvent *) e);
         e->accept();
@@ -68,6 +74,18 @@ bool QmmpTrayIcon::event(QEvent *e)
     return QSystemTrayIcon::event(e);
 }
 
+bool QmmpTrayIcon::hasToolTipEvent()
+{
+    //checking for XEmbed system tray implementation
+    //only this implementation is able to send QHelpEvent
+    foreach (QWindow *w, qApp->allWindows())
+    {
+        if(w->objectName() == "QSystemTrayIconSysWindow")
+            return true;
+    }
+    return false;
+}
+
 void QmmpTrayIcon::wheelEvent(QWheelEvent *e)
 {
     SoundCore::instance()->changeVolume(e->delta()/20);