Frontends

Timestamp:

Sep 7, 2023 1:05:21 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Unify filter-out logic in UIEditor more universal way; Making it applicable to settings page/frame as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp

-              r101031
+              r101051
+}
-void UISettingsPage::filterOut(const QString &strFilter)
+{
-    /* Propagate filter towards all the children: */
-    foreach (UIEditor *pEditor, m_editors)
-        pEditor->filterOut(strFilter);
-    /* Check if at least one of children visible: */
-    bool fVisible = false;
-    foreach (UIEditor *pEditor, m_editors)
-        if (pEditor->isVisibleTo(this))
+        {
-            fVisible = true;
-            break;
+        }
-    /* Update page visibility: */
-    setVisible(fVisible);
+}
 void UISettingsPage::revalidate()
+{
 …
     if (m_pLabelName)
         m_pLabelName->setText(m_strName);
+}
-void UISettingsPageFrame::filterOut(const QString &strFilter)
+{
-    /* Propagate filter to the child: */
-    AssertReturnVoid(m_editors.size() == 1);
-    m_editors.first()->filterOut(strFilter);
-    /* Check if child visible: */
-    const bool fVisible = m_editors.first()->isVisibleTo(this);
-    /* Update frame visibility: */
-    setVisible(fVisible);
+}

-              r101031
+              r101051
     virtual void polishPage() {}
-    /** Filters out contents with description unrelated to passed @a strFilter. */
-    virtual void filterOut(const QString &strFilter) RT_OVERRIDE;
 public slots:
 …
     void setName(const QString &strName);
-    /** Filters out contents with description unrelated to passed @a strFilter. */
-    virtual void filterOut(const QString &strFilter) RT_OVERRIDE;
 protected:

-              r101030
+              r101051
 void UIEditor::filterOut(const QString &strFilter)
+{
+    /* Make sure the editor is visible in case if filter is empty: */
+    /* Propagate filter towards all the children: */
+    foreach (UIEditor *pEditor, m_editors)
+        pEditor->filterOut(strFilter);
+    /* Make sure the editor is visible if filter is empty: */
     bool fVisible = strFilter.isEmpty();
+    /* If editor still hidden we'll need to make it
+     * visible if at least one of children is. */
     if (!fVisible)
+    {
+        /* Otherwise we'll have to walk through all the
+         * descriptions to check whether filter is suitable: */
+        foreach (UIEditor *pEditor, m_editors)
+            if (pEditor->isVisibleTo(this))
+            {
+                fVisible = true;
+                break;
+            }
+    }
+    /* If editor still hidden we'll need to make it
+     * visible if at least one of descriptions suits filter well: */
+    if (!fVisible)
+    {
         foreach (const QString &strDescription, description())
             if (strDescription.contains(strFilter, Qt::CaseInsensitive))
 …
+            }
+    }
+    /* We'll show whole the editor if filter is suitable: */
+    /* Update widget visibility: */
     setVisible(fVisible);
+}

Note: See TracChangeset for help on using the changeset viewer.