Changeset 79780 in vbox for trunk

Timestamp:

Jul 15, 2019 7:23:15 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Mess up release press order in r132145

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (14 diffs)
• UISoftKeyboard.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -146 +146 @@
     UISoftKeyboardKey *lockKey(int iKeyPosition) const;
     void updateLockKeyStates(bool fCapsLockState, bool fNumLockState, bool fScrollLockState);
+    void reset();
 
 private:
@@ -177 +178 @@
     void setLayoutToEdit(UISoftKeyboardLayout *pLayout);
     void setPhysicalLayoutList(const QVector<UISoftKeyboardPhysicalLayout> &physicalLayouts);
+    void reset();
 
 protected:
@@ -197 +199 @@
     void prepareConnections();
     QWidget *prepareKeyCaptionEditWidgets();
-    void reset();
     void resetKeyWidgets();
     QGridLayout *m_pEditorLayout;
@@ -356 +357 @@
     void setCutout(int iCorner, int iWidth, int iHeight);
 
+    KeyState state() const;
+    void setState(KeyState state);
+
     void setParentWidget(UISoftKeyboardWidget* pParent);
-    KeyState state() const;
     QVector<LONG> scanCodeWithPrefix() const;
 
@@ -373 +376 @@
 
     void updateLockState(bool fLocked);
+    void reset();
 
 private:
@@ -572 +576 @@
       * from the guest OS. Parameter fXXXState is true if the corresponding key is locked. */
     void updateLockKeyStates(bool fCapsLockState, bool fNumLockState, bool fScrollLockState);
+    void reset();
 
 protected:
@@ -600 +605 @@
     bool               loadPhysicalLayout(const QString &strLayoutFileName, bool isNumPad = false);
     bool               loadKeyboardLayout(const QString &strLayoutName);
-    void               reset();
     void               prepareObjects();
     UISoftKeyboardPhysicalLayout *findPhysicalLayout(const QUuid &uuid);
@@ -820 +824 @@
     updateLockKeyState(fNumLockState, m_lockKeys.value(iNumLockPosition, 0));
     updateLockKeyState(fScrollLockState, m_lockKeys.value(iScrollLockPosition, 0));
+}
+
+void UISoftKeyboardPhysicalLayout::reset()
+{
+    for (int i = 0; i < m_rows.size(); ++i)
+    {
+        for (int j = 0; j < m_rows[i].keys().size(); ++j)
+        {
+            m_rows[i].keys()[j].reset();
+        }
+    }
 }
 
@@ -1555 +1570 @@
 }
 
+void UISoftKeyboardKey::setState(KeyState state)
+{
+    m_enmState = state;
+}
+
 void UISoftKeyboardKey::setParentWidget(UISoftKeyboardWidget* pParent)
 {
@@ -1650 +1670 @@
         return;
     updateState(fLocked);
+}
+
+void UISoftKeyboardKey::reset()
+{
+    m_enmState = KeyState_NotPressed;
 }
 
@@ -2552 +2577 @@
     if (!pKey || pKey->type() != KeyType_Modifier)
         return;
-    if (pKey->state() != KeyState_NotPressed)
-        return;
+
+    pKey->setState(KeyState_NotPressed);
+
     QVector<QPair<LONG, LONG> > sequence;
     sequence << pKey->usagePageIdPair();
     if (fRelease)
+        emit sigPutUsageCodesRelease(sequence);
+    else
         emit sigPutUsageCodesPress(sequence);
-    else
-        emit sigPutUsageCodesRelease(sequence);
 }
 
@@ -2751 +2777 @@
 {
     m_pressedModifiers.clear();
+    m_pKeyUnderMouse = 0;
+    m_pKeyBeingEdited = 0;
+    m_pKeyPressed = 0;
+    m_enmMode = Mode_Keyboard;
+
+    for (int i = 0; i < m_physicalLayouts.size(); ++i)
+        m_physicalLayouts[i].reset();
 }
 
@@ -3465 +3498 @@
 {
     saveSettings();
+    keyboard().ReleaseKeys();
 }
 
@@ -3832 +3866 @@
 }
 
+void UISoftKeyboard::reset()
+{
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->reset();
+    if (m_pLayoutEditor)
+        m_pLayoutEditor->reset();
+    keyboard().ReleaseKeys();
+}
+
 #include "UISoftKeyboard.moc"

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -101 +101 @@
     void updateLayoutSelectorList();
     void setDialogGeometry(const QRect &geometry);
+    void reset();
     CKeyboard& keyboard() const;