Changeset 28148 in vbox

Timestamp:

Apr 9, 2010 3:41:14 PM (15 years ago)

Author:

vboxsync

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

59879

Message:

FE/Qt4: xtracker 4812: disable focus in/out hack for recent Qt versions

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -2284 +2284 @@
         /* We have to handle XFocusOut right here as this event is not passed
          * to VBoxConsoleView::event(). Handling this event is important for
-         * releasing the keyboard before the screen saver gets active. */
+         * releasing the keyboard before the screen saver gets active.
+         *
+         * See public ticket #3894: Apparently this makes problems with newer
+         * versions of Qt and this hack is probably not necessary anymore.
+         * So disable it for Qt >= 4.5.0. */
         case XFocusOut:
         case XFocusIn:
             if (isRunning())
-                focusEvent (event->type == XFocusIn);
+            {
+                if (VBoxGlobal::qtRTVersion() < ((4 << 16) | (5 << 8) | 0))
+                    focusEvent (event->type == XFocusIn);
+            }
             return false;
         case XKeyPress:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -2196 +2196 @@
         /* We have to handle XFocusOut right here as this event is not passed
          * to UIMachineView::event(). Handling this event is important for
-         * releasing the keyboard before the screen saver gets active. */
+         * releasing the keyboard before the screen saver gets active.
+         *
+         * See public ticket #3894: Apparently this makes problems with newer
+         * versions of Qt and this hack is probably not necessary anymore.
+         * So disable it for Qt >= 4.5.0. */
         case XFocusOut:
         case XFocusIn:
             if (uisession()->isRunning())
-                focusEvent(pEvent->type == XFocusIn);
+            {
+                if (VBoxGlobal::qtRTVersion() < ((4 << 16) | (5 << 8) | 0))
+                    focusEvent (pEvent->type == XFocusIn);
+            }
             return false;
         case XKeyPress: