Changeset 91002 in vbox for trunk/src/VBox

Timestamp:

Aug 30, 2021 3:07:42 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: Maybe a better solution to vm search widget show/hide bug than r146545.

Location:

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

Files:

• UIChooserHandlerKeyboard.cpp (modified) (2 diffs)
• UIChooserHandlerKeyboard.h (modified) (5 diffs)

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

@@ -307 +307 @@
             /* Start lookup only for non-empty and alphanumerical strings: */
             const QString strText = pEvent->text();
-            if (!strText.isEmpty() && !strText.contains(QRegExp("[^A-Za-z0-9]", Qt::CaseInsensitive)))
+            if (!checkKey(pEvent->key()) && !strText.isEmpty())
                 model()->lookFor(strText);
             break;
@@ -393 +393 @@
     model()->saveGroups();
 }
+
+bool UIChooserHandlerKeyboard::checkKey(int iKey) const
+{
+    if (iKey == Qt::Key_Tab ||
+        iKey == Qt::Key_Backtab ||
+        iKey == Qt::Key_Backspace ||
+        iKey == Qt::Key_Pause ||
+        iKey == Qt::Key_Print ||
+        iKey == Qt::Key_SysReq ||
+        iKey == Qt::Key_Home ||
+        iKey == Qt::Key_End ||
+        iKey == Qt::Key_Left ||
+        iKey == Qt::Key_Up ||
+        iKey == Qt::Key_Right ||
+        iKey == Qt::Key_Down ||
+        iKey == Qt::Key_PageUp ||
+        iKey == Qt::Key_PageDown ||
+        iKey == Qt::Key_Shift ||
+        iKey == Qt::Key_Alt ||
+        iKey == Qt::Key_AltGr ||
+        iKey == Qt::Key_CapsLock ||
+        iKey == Qt::Key_NumLock ||
+        iKey == Qt::Key_ScrollLock ||
+        iKey == Qt::Key_Control)
+        return true;
+
+    if ((Qt::Key)iKey >= Qt::Key_F1 &&
+        (Qt::Key)iKey <= Qt::Key_F35)
+        return true;
+
+    return false;
+}

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

@@ -30 +30 @@
 class QKeyEvent;
 
-/* Keyboard event type: */
+/** Keyboard event type. */
 enum UIKeyboardEventType
 {
@@ -37 +37 @@
 };
 
-/* Item shift direction: */
+/** Item shift direction. */
 enum UIItemShiftDirection
 {
@@ -51 +51 @@
 };
 
-/* Keyboard handler for graphics selector: */
+/** Keyboard handler for graphics selector. */
 class UIChooserHandlerKeyboard : public QObject
 {
@@ -58 +58 @@
 public:
 
-    /* Constructor: */
+    /** Constructor. */
     UIChooserHandlerKeyboard(UIChooserModel *pParent);
 
-    /* API: Model keyboard-event handler delegate: */
+    /** API: Model keyboard-event handler delegate. */
     bool handle(QKeyEvent *pEvent, UIKeyboardEventType type) const;
 
 private:
 
-    /* API: Model wrapper: */
+    /** API: Model wrapper. */
     UIChooserModel* model() const;
 
-    /* Helpers: Model keyboard-event handler delegates: */
+    /** Helpers: Model keyboard-event handler delegates. */
     bool handleKeyPress(QKeyEvent *pEvent) const;
     bool handleKeyRelease(QKeyEvent *pEvent) const;
 
-    /* Helper: Item shift delegate: */
+    /** Helper: Item shift delegate. */
     void shift(UIItemShiftDirection enmDirection, UIItemShiftType enmShiftType) const;
 
-    /* Variables: */
+    /** Checks the iKey against a set of special keys and returns true if it is one of them.
+      * Depending of this return value we either show the vm search widget or ignore the key event.
+      * @param  iKey  Qt::key type we get from QKeyEvent::key(). */
+    bool checkKey(int iKey) const;
+
+    /** Variables. */
     UIChooserModel *m_pModel;
     QMap<int, UIItemShiftType> m_shiftMap;
@@ -82 +87 @@
 
 #endif /* !FEQT_INCLUDED_SRC_manager_chooser_UIChooserHandlerKeyboard_h */
-