Changeset 10339 in vbox for trunk/src/VBox

Timestamp:

Jul 7, 2008 4:26:39 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Check for active popup's or other modal widgets on pressing the enter
key also.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/QIMainDialog.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/QIMainDialog.cpp

@@ -263 +263 @@
         case QEvent::KeyPress:
             {
+                /* Make sure that we only proceed if no
+                 * popup or other modal widgets are open. */
+                if (aObject != this ||
+                    qApp->activePopupWidget() != NULL ||
+                    !(qApp->activeModalWidget() == this || 
+                      qApp->activeModalWidget() == NULL))
+                    break;
                 QKeyEvent *event = static_cast<QKeyEvent*> (aEvent);
 #ifdef Q_WS_MAC
                 if (event->modifiers() == Qt::ControlModifier && 
-                    event->key() == Qt::Key_Period &&
-                    aObject == this &&
-                    qApp->activePopupWidget() == NULL &&
-                    (qApp->activeModalWidget() == this || 
-                     qApp->activeModalWidget() == NULL))
+                    event->key() == Qt::Key_Period)
                     reject();
                 else
@@ -294 +297 @@
                             case Qt::Key_Escape:
                                 {
-                                    /* Make sure that we only reject if no
-                                     * popup or other modal widgets are open. */
-                                    if (aObject == this &&
-                                        qApp->activePopupWidget() == NULL &&
-                                        (qApp->activeModalWidget() == this || 
-                                         qApp->activeModalWidget() == NULL))
-                                    {
-                                        reject();
-                                        return true;
-                                    }
+                                    reject();
+                                    return true;
                                     break;
                                 }