Changeset 52638 in vbox

Timestamp:

Sep 8, 2014 11:08:19 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Focus policy fix: Make sure machine-view has focus on machine-window (re)initialization; remove old menu-bar focus hack.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• scale/UIMachineWindowScale.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -401 +401 @@
         m_pMiniToolBar->adjustGeometry(iHostScreen);
     }
+
+    /* Make sure machine-view have focus: */
+    m_pMachineView->setFocus();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -87 +87 @@
         }
     }
-
-#ifdef Q_WS_WIN
-    else if (pWatched != 0 && pWatched == machineWindow()->menuBar())
-    {
-        /* Due to windows host uses separate 'focus set' to let menubar to
-         * operate while popped up (see UIMachineViewNormal::event() for details),
-         * it also requires backward processing: */
-        switch (pEvent->type())
-        {
-            /* If menubar gets the focus while not popped up => give it back: */
-            case QEvent::FocusIn:
-            {
-                if (!QApplication::activePopupWidget())
-                    setFocus();
-            }
-            default:
-                break;
-        }
-    }
-#endif /* Q_WS_WIN */
 
     return UIMachineView::eventFilter(pWatched, pEvent);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -411 +411 @@
     /* Show in normal mode: */
     show();
+
+    /* Make sure machine-view have focus: */
+    m_pMachineView->setFocus();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -155 +155 @@
     /* Show in normal mode: */
     show();
+
+    /* Make sure machine-view have focus: */
+    m_pMachineView->setFocus();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -211 +211 @@
     }
 #endif /* !Q_WS_MAC */
+
+    /* Make sure machine-view have focus: */
+    m_pMachineView->setFocus();
 }