Changeset 62154 in vbox for trunk/src

Timestamp:

Jul 11, 2016 10:51:34 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8151: X11: Runtime UI: Missed few facts of the intended logic, fixing it (s.a. r108605).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (4 diffs)

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

@@ -396 +396 @@
         free(pGrabReply);
 
+        /* Successfully captured, stop delayed capture attempts: */
+        m_idxDelayedKeyboardCaptureView = -1;
+
 # endif /* QT_VERSION >= 0x050000 */
 #else
@@ -409 +412 @@
         /* Store new keyboard-captured state value: */
         m_fIsKeyboardCaptured = true;
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
-        /* Successfully captured, stop delayed capture attempts: */
-        m_idxDelayedKeyboardCaptureView = -1;
-#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
         /* Notify all the listeners: */
@@ -421 +420 @@
 void UIKeyboardHandler::releaseKeyboard()
 {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /* If we haven't captured the keyboard by now it is too late: */
+    m_idxDelayedKeyboardCaptureView = -1;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
     /* Do NOT release the keyboard if it is already released: */
     if (!m_fIsKeyboardCaptured)
@@ -506 +510 @@
         /* Store new keyboard-captured state value: */
         m_fIsKeyboardCaptured = false;
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
-        /* If we haven't captured the keyboard by now it is too late: */
-        m_idxDelayedKeyboardCaptureView = -1;
-#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
         /* Notify all the listeners: */