Fix issues with PopupHelpWidget on Linux and macOS

* Clean up parent alignment code
* Don't hide widget if it currently has focus
* Use Qt::Tool window type on macOS as well. This prevents the popup help from hiding to the background if the main window has focus.
* Fixes #2814

src/gui/SearchHelpWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>487</width>
+    <width>397</width>
-    <height>326</height>
+    <height>264</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,28 +20,10 @@
    <enum>QFrame::StyledPanel</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetDefaultConstraint</enum>
-   </property>
-   <property name="leftMargin">
-    <number>5</number>
-   </property>
-   <property name="topMargin">
-    <number>5</number>
-   </property>
-   <property name="rightMargin">
-    <number>5</number>
-   </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
    <item>
     <widget class="QLabel" name="label_2">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -63,7 +45,7 @@
    <item>
     <widget class="QLabel" name="label_24">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -96,24 +78,6 @@
         <string>Modifiers</string>
        </property>
        <layout class="QFormLayout" name="formLayout">
-        <property name="horizontalSpacing">
-         <number>8</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>8</number>
-        </property>
-        <property name="leftMargin">
-         <number>9</number>
-        </property>
-        <property name="topMargin">
-         <number>10</number>
-        </property>
-        <property name="rightMargin">
-         <number>9</number>
-        </property>
-        <property name="bottomMargin">
-         <number>9</number>
-        </property>
         <item row="0" column="0">
          <widget class="QLabel" name="label_4">
           <property name="minimumSize">
@@ -222,21 +186,6 @@
         <bool>false</bool>
        </property>
        <layout class="QGridLayout" name="gridLayout">
-        <property name="leftMargin">
-         <number>15</number>
-        </property>
-        <property name="topMargin">
-         <number>10</number>
-        </property>
-        <property name="rightMargin">
-         <number>15</number>
-        </property>
-        <property name="horizontalSpacing">
-         <number>8</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>5</number>
-        </property>
         <item row="1" column="0">
          <widget class="QLabel" name="label_3">
           <property name="text">
@@ -299,12 +248,6 @@
         <string>Term Wildcards</string>
        </property>
        <layout class="QFormLayout" name="formLayout_2">
-        <property name="horizontalSpacing">
-         <number>8</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>8</number>
-        </property>
         <item row="0" column="0">
          <widget class="QLabel" name="label_18">
           <property name="minimumSize">
@@ -404,9 +347,6 @@
         <string>Examples</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
-        <property name="spacing">
-         <number>8</number>
-        </property>
         <item>
          <widget class="QLabel" name="label_9">
           <property name="sizePolicy">

src/gui/SearchWidget.cpp

@@ -38,7 +38,6 @@ SearchWidget::SearchWidget(QWidget* parent)
     setFocusProxy(m_ui->searchEdit);
 
     m_helpWidget = new PopupHelpWidget(m_ui->searchEdit);
-    m_helpWidget->setOffset(QPoint(0, 1));
     Ui::SearchHelpWidget helpUi;
     helpUi.setupUi(m_helpWidget);
 

src/gui/widgets/PopupHelpWidget.cpp

@@ -23,27 +23,22 @@
 
 PopupHelpWidget::PopupHelpWidget(QWidget* parent)
     : QFrame(parent)
-    , m_parentWindow(parent->window())
     , m_appWindow(getMainWindow())
     , m_offset({0, 0})
     , m_corner(Qt::BottomLeftCorner)
 {
     Q_ASSERT(parent);
 
-#ifdef Q_OS_MACOS
-    setWindowFlags(Qt::FramelessWindowHint | Qt::Drawer);
-#else
     setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
-#endif
     hide();
 
     m_appWindow->installEventFilter(this);
-    parent->installEventFilter(this);
+    parentWidget()->installEventFilter(this);
 }
 
 PopupHelpWidget::~PopupHelpWidget()
 {
-    m_parentWindow->removeEventFilter(this);
+    m_appWindow->removeEventFilter(this);
     parentWidget()->removeEventFilter(this);
 }
 
@@ -65,10 +60,10 @@ void PopupHelpWidget::setPosition(Qt::Corner corner)
 
 bool PopupHelpWidget::eventFilter(QObject* obj, QEvent* event)
 {
-    if (obj == parentWidget() && event->type() == QEvent::FocusOut) {
+    if (isVisible()) {
+        if (obj == parentWidget() && event->type() == QEvent::FocusOut && qApp->focusWindow() != windowHandle()) {
             hide();
         } else if (obj == m_appWindow && (event->type() == QEvent::Move || event->type() == QEvent::Resize)) {
-        if (isVisible()) {
             alignWithParent();
         }
     }
@@ -83,21 +78,22 @@ void PopupHelpWidget::showEvent(QShowEvent* event)
 
 void PopupHelpWidget::alignWithParent()
 {
-    QPoint pos;
+    QPoint pos = m_offset;
     switch (m_corner) {
     case Qt::TopLeftCorner:
-        pos = parentWidget()->geometry().topLeft() + m_offset - QPoint(0, height());
+        pos += QPoint(0, -height());
         break;
     case Qt::TopRightCorner:
-        pos = parentWidget()->geometry().topRight() + m_offset - QPoint(width(), height());
+        pos += QPoint(parentWidget()->width(), -height());
         break;
     case Qt::BottomRightCorner:
-        pos = parentWidget()->geometry().bottomRight() + m_offset - QPoint(width(), 0);
+        pos += QPoint(parentWidget()->width(), parentWidget()->height());
         break;
+    case Qt::BottomLeftCorner:
     default:
-        pos = parentWidget()->geometry().bottomLeft() + m_offset;
+        pos += QPoint(0, parentWidget()->height());
         break;
     }
 
-    move(m_parentWindow->mapToGlobal(pos));
+    move(parentWidget()->mapToGlobal(pos));
 }

src/gui/widgets/PopupHelpWidget.h

@@ -37,7 +37,6 @@ protected:
 
 private:
     void alignWithParent();
-    QPointer<QWidget> m_parentWindow;
     QPointer<QWidget> m_appWindow;
 
     QPoint m_offset;