Changeset 27089 in vbox for trunk/src/VBox

Timestamp:

Mar 5, 2010 1:59:37 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58414

Message:

FE/Qt4: New running VM core: just a cosmetics.

Location:

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

Files:

• UIMachineWindowSeamless.cpp (modified) (2 diffs)
• UIMachineWindowSeamless.h (modified) (1 diff)

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

@@ -110 +110 @@
 }
 
-#ifdef Q_WS_X11
-bool UIMachineWindowSeamless::x11Event(XEvent *pEvent)
-{
-    /* Qt bug: when the console view grabs the keyboard, FocusIn, FocusOut,
-     * WindowActivate and WindowDeactivate Qt events are not properly sent
-     * on top level window (i.e. this) deactivation. The fix is to substiute
-     * the mode in FocusOut X11 event structure to NotifyNormal to cause
-     * Qt to process it as desired. */
-    if (pEvent->type == FocusOut)
-    {
-        if (pEvent->xfocus.mode == NotifyWhileGrabbed  &&
-            (pEvent->xfocus.detail == NotifyAncestor ||
-             pEvent->xfocus.detail == NotifyInferior ||
-             pEvent->xfocus.detail == NotifyNonlinear))
-        {
-             pEvent->xfocus.mode = NotifyNormal;
-        }
-    }
-    return false;
-}
-#endif
-
 #ifdef Q_WS_MAC
 bool UIMachineWindowSeamless::event(QEvent *pEvent)
@@ -149 +127 @@
 }
 #endif /* Q_WS_MAC */
+
+#ifdef Q_WS_X11
+bool UIMachineWindowSeamless::x11Event(XEvent *pEvent)
+{
+    /* Qt bug: when the console view grabs the keyboard, FocusIn, FocusOut,
+     * WindowActivate and WindowDeactivate Qt events are not properly sent
+     * on top level window (i.e. this) deactivation. The fix is to substiute
+     * the mode in FocusOut X11 event structure to NotifyNormal to cause
+     * Qt to process it as desired. */
+    if (pEvent->type == FocusOut)
+    {
+        if (pEvent->xfocus.mode == NotifyWhileGrabbed  &&
+            (pEvent->xfocus.detail == NotifyAncestor ||
+             pEvent->xfocus.detail == NotifyInferior ||
+             pEvent->xfocus.detail == NotifyNonlinear))
+        {
+             pEvent->xfocus.mode = NotifyNormal;
+        }
+    }
+    return false;
+}
+#endif
 
 void UIMachineWindowSeamless::closeEvent(QCloseEvent *pEvent)

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

@@ -56 +56 @@
 
     /* Event handlers: */
+#ifdef Q_WS_MAC
+    bool event(QEvent *pEvent);
+#endif /* Q_WS_MAC */
 #ifdef Q_WS_X11
     bool x11Event(XEvent *pEvent);
 #endif /* Q_WS_X11 */
     void closeEvent(QCloseEvent *pEvent);
-#ifdef Q_WS_MAC
-    bool event(QEvent *pEvent);
-#endif /* Q_WS_MAC */
 
     /* Prepare helpers: */