Changeset 77812 in vbox for trunk/src/VBox

Timestamp:

Mar 20, 2019 4:33:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9378. Handling keybord focus a bit better.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserModel.cpp (modified) (2 diffs)
• UIChooserSearchWidget.cpp (modified) (2 diffs)
• UIChooserView.cpp (modified) (3 diffs)
• UIChooserView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -522 +522 @@
     else
     {
-        if (m_iCurrentScrolledIndex < 0)
+        if (--m_iCurrentScrolledIndex < 0)
             m_iCurrentScrolledIndex = m_searchResults.size() - 1;
     }
@@ -828 +828 @@
 void UIChooserModel::sltShowHideSearchWidget()
 {
-    UIChooserView *pChooserView = view();
-    if (!pChooserView)
-        return;
-    pChooserView->toggleSearchWidget();
+    if (view())
+        setSearchWidgetVisible(!view()->isSearchWidgetVisible());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserSearchWidget.cpp

@@ -117 +117 @@
     if (m_pLineEdit)
     {
-        connect(m_pLineEdit, &QILineEdit::textEdited,
+        connect(m_pLineEdit, &QILineEdit::textChanged,
                 this, &UIChooserSearchWidget::sltHandleSearchTermChange);
     }
@@ -163 +163 @@
         {
             if (pKeyEvent->key() == Qt::Key_Escape)
+            {
                 emit sigToggleVisibility(false);
+                return true;
+            }
+            else if (pKeyEvent->key() == Qt::Key_Up || pKeyEvent->key() == Qt::Key_Down)
+            {
+                emit sigScrollToMatch(pKeyEvent->key() == Qt::Key_Down);
+                return true;
+            }
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp

@@ -102 +102 @@
 }
 
-void UIChooserView::toggleSearchWidget()
+bool UIChooserView::isSearchWidgetVisible() const
 {
     if (!m_pSearchWidget)
-        return;
-    bool fVisible = m_pSearchWidget->isVisible();
-    setSearchWidgetVisible(!fVisible);
+        return false;
+    return m_pSearchWidget->isVisible();
 }
 
@@ -114 +113 @@
     if (!m_pSearchWidget)
         return;
+
+    /** Make sure keyboard focus is managed ccorectly. */
+    if (fVisible)
+        m_pSearchWidget->setFocus();
+    else
+        setFocus();
+
     if (m_pSearchWidget->isVisible() == fVisible)
         return;
@@ -121 +127 @@
 
     UIChooserModel *pModel =  m_pChooser->model();
-    if (!pModel)
-        return;
-    pModel->resetSearch();
+    if (pModel)
+        pModel->resetSearch();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.h

@@ -54 +54 @@
     /** @name Virtual Machine search stuff.
       * @{ */
-        /** Shows/hides machine search widget. */
-        void toggleSearchWidget();
-        /** Shows/hides machine search widget. */
+        /** Returns if the search widget is visible or not. */
+        bool isSearchWidgetVisible() const;
+        /** Shows/hides wrt. @a fVisible machine search widget. */
         void setSearchWidgetVisible(bool fVisible);
         /** Updates the search widget's counts. */