Plugins::WebBrowser: fix CAddressCompleter show in wayland

Author: KangLin

Plugins/WebBrowser/AddressCompleter.cpp

@@ -61,6 +61,7 @@ CAddressCompleter::CAddressCompleter(CHistoryDatabase *db, QWidget *parent)
     , m_maxVisibleItems(8)
     , m_isCompleterVisible(false)
     , m_pDatabase(db)
+    , m_bIsWayland(false)
 {
     m_szEnter = tr("Enter '@' show commands") + "; "
                 + tr("Enter a website URL or search content ......");
@@ -77,6 +78,13 @@ CAddressCompleter::CAddressCompleter(CHistoryDatabase *db, QWidget *parent)
     m_szLineEditToolTipShow = m_szEnter + "\n\n" + m_szListWidgetToolTip;
     setToolTip(m_szListWidgetToolTip);
 
+#if defined(Q_OS_LINUX)
+    if(-1 == QGuiApplication::platformName().indexOf(QRegularExpression("wayland.*")))
+        m_bIsWayland = false;
+    else
+        m_bIsWayland = true;
+#endif
+
     setupUI();
 
     // 设置搜索延迟定时器（300ms防抖动）
@@ -103,7 +111,12 @@ CAddressCompleter::~CAddressCompleter()
 
 void CAddressCompleter::setupUI()
 {
-    setWindowFlags(Qt::Tool /*Qt::ToolTip*/ | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);
+    Qt::WindowFlags flags;
+    flags = Qt::FramelessWindowHint | Qt::CustomizeWindowHint;
+    if(!m_bIsWayland) {
+        flags |= Qt::Tool;
+    }
+    setWindowFlags(flags);
     setAttribute(Qt::WA_TranslucentBackground);
 
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -508,11 +521,15 @@ void CAddressCompleter::showCompleter()
         m_pShowAnimation->setEndValue(endRect);
         m_pShowAnimation->setEasingCurve(QEasingCurve::OutCubic);
         connect(m_pShowAnimation, &QPropertyAnimation::finished,
-                this, &CAddressCompleter::show);
+                this, [this]() {
+            show();
+            raise();
+        });
         m_pShowAnimation->start();
     } else {
         setGeometry(endRect);
         show();
+        raise();
     }
 }
 
@@ -576,6 +593,15 @@ void CAddressCompleter::updateCompleterPosition()
         }
     }
 
+    if(m_bIsWayland) {
+        QWidget* pWin = qobject_cast<QWidget*>(parent());
+        if(pWin) {
+            globalPos = pWin->mapFromGlobal(globalPos);
+        } else {
+            qCritical(log) << "Current platform plugin is wayland. the parent must be setted.";
+        }
+    }
+
     // 设置位置和大小
     setGeometry(globalPos.x(), globalPos.y(), width, 0);
 }

Plugins/WebBrowser/AddressCompleter.h

@@ -41,7 +41,7 @@ class CAddressCompleter : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CAddressCompleter(CHistoryDatabase* db, QWidget *parent = nullptr);
+    explicit CAddressCompleter(CHistoryDatabase* db, QWidget *parent);
     ~CAddressCompleter();
 
     void attachToLineEdit(QLineEdit *lineEdit);
@@ -96,4 +96,5 @@ private Q_SLOTS:
     bool m_isCompleterVisible;
 
     CHistoryDatabase* m_pDatabase;
+    bool m_bIsWayland;
 };