Changeset 78891 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 31, 2019 10:20:17 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Some refactoring.

Location:

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

Files:

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

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

@@ -93 +93 @@
 class UISoftKeyboardKey
 {
-
 public:
 
@@ -167 +166 @@
 
 /*********************************************************************************************************************************
+*   UISoftKeyboardWidget definition.                                                                                  *
+*********************************************************************************************************************************/
+class UISoftKeyboardWidget : public QWidget
+{
+    Q_OBJECT;
+
+public:
+
+    UISoftKeyboardWidget(QWidget *pParent = 0);
+    virtual QSize minimumSizeHint() const;
+    virtual QSize sizeHint() const;
+    void setNewMinimumSize(const QSize &size);
+    QVector<UISoftKeyboardRow> m_rows;
+    void setInitialSize(int iWidth, int iHeight);
+
+protected:
+
+    void paintEvent(QPaintEvent *pEvent) /* override */;
+    void mousePressEvent(QMouseEvent *pEvent);
+    void mouseMoveEvent(QMouseEvent *pEvent);
+
+private:
+
+    UISoftKeyboardKey *keyUnderMouse(QMouseEvent *pEvent);
+
+    QSize m_minimumSize;
+    int m_iInitialHeight;
+    int m_iInitialWidth;
+    float m_fMultiplierX;
+    float m_fMultiplierY;
+    UISoftKeyboardKey *m_pKeyUnderMouse;
+    QColor m_keyDefaultColor;
+    QColor m_keyHoverColor;
+    QColor m_keyPressColor;
+    QColor m_textDefaultColor;
+};
+
+/*********************************************************************************************************************************
 *   UIKeyboardLayoutReader definition.                                                                                  *
 *********************************************************************************************************************************/
@@ -433 +470 @@
         }
     }
+}
+
+/*********************************************************************************************************************************
+*   UISoftKeyboardWidget implementation.                                                                                  *
+*********************************************************************************************************************************/
+
+UISoftKeyboardWidget::UISoftKeyboardWidget(QWidget *pParent /* = 0 */)
+    :QWidget(pParent)
+    , m_pKeyUnderMouse(0)
+    , m_keyDefaultColor(QColor(255, 228, 192))
+    , m_keyHoverColor(QColor(238, 208, 169))
+    , m_keyPressColor(QColor(248, 218, 179))
+    , m_textDefaultColor(QColor(0, 0, 0))
+{
+    setMouseTracking(true);
+}
+
+QSize UISoftKeyboardWidget::minimumSizeHint() const
+{
+    return m_minimumSize;
+}
+
+QSize UISoftKeyboardWidget::sizeHint() const
+{
+    return m_minimumSize;
+}
+
+void UISoftKeyboardWidget::setNewMinimumSize(const QSize &size)
+{
+    m_minimumSize = size;
+    updateGeometry();
+}
+
+void UISoftKeyboardWidget::setInitialSize(int iWidth, int iHeight)
+{
+    m_iInitialWidth = iWidth;
+    m_iInitialHeight = iHeight;
+}
+
+void UISoftKeyboardWidget::paintEvent(QPaintEvent *pEvent) /* override */
+{
+    Q_UNUSED(pEvent);
+    if (m_iInitialWidth == 0 || m_iInitialHeight == 0)
+        return;
+
+    m_fMultiplierX = width() / (float) m_iInitialWidth;
+    m_fMultiplierY = height() / (float) m_iInitialHeight;
+
+    QPainter painter(this);
+    QFont painterFont(font());
+    painterFont.setPixelSize(15);
+    painterFont.setBold(false);
+    painter.setFont(painterFont);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setPen(QPen(QColor(m_textDefaultColor), 2));
+    painter.setBrush(QBrush(m_keyDefaultColor));
+    painter.scale(m_fMultiplierX, m_fMultiplierY);
+    for (int i = 0; i < m_rows.size(); ++i)
+    {
+        QVector<UISoftKeyboardKey> &keys = m_rows[i].keys();
+        for (int j = 0; j < keys.size(); ++j)
+        {
+            UISoftKeyboardKey &key = keys[j];
+            painter.translate(key.keyGeometry().x(), key.keyGeometry().y());
+            painter.drawPolygon(key.polygon());
+            QRect textRect(5, 5, key.keyGeometry().width(), key.keyGeometry().height());
+            painter.drawText(textRect, Qt::TextWordWrap, key.keyCap());
+            painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y());
+        }
+    }
+
+    if (m_pKeyUnderMouse)
+    {
+        painter.setBrush(QBrush(m_keyHoverColor));
+        painter.translate(m_pKeyUnderMouse->keyGeometry().x(), m_pKeyUnderMouse->keyGeometry().y());
+        painter.drawPolygon(m_pKeyUnderMouse->polygon());
+        QRect textRect(5, 5, m_pKeyUnderMouse->keyGeometry().width(), m_pKeyUnderMouse->keyGeometry().height());
+        painter.drawText(textRect, Qt::TextWordWrap, m_pKeyUnderMouse->keyCap());
+        painter.translate(-m_pKeyUnderMouse->keyGeometry().x(), -m_pKeyUnderMouse->keyGeometry().y());
+    }
+}
+
+void UISoftKeyboardWidget::mousePressEvent(QMouseEvent *pEvent)
+{
+    keyUnderMouse(pEvent);
+}
+
+void UISoftKeyboardWidget::mouseMoveEvent(QMouseEvent *pEvent)
+{
+    keyUnderMouse(pEvent);
+}
+
+UISoftKeyboardKey *UISoftKeyboardWidget::keyUnderMouse(QMouseEvent *pEvent)
+{
+    QPoint eventPosition(pEvent->pos().x() / m_fMultiplierX, pEvent->pos().y() / m_fMultiplierY);
+    QWidget::mousePressEvent(pEvent);
+    for (int i = 0; i < m_rows.size(); ++i)
+    {
+        QVector<UISoftKeyboardKey> &keys = m_rows[i].keys();
+        for (int j = 0; j < keys.size(); ++j)
+        {
+            UISoftKeyboardKey &key = keys[j];
+            if (key.polygonInGlobal().containsPoint(eventPosition, Qt::OddEvenFill))
+            {
+                if (&key != m_pKeyUnderMouse)
+                {
+                    m_pKeyUnderMouse = &key;
+                    update();
+                }
+                return &key;
+                break;
+            }
+        }
+    }
+    return 0;
 }
 
@@ -649 +801 @@
 }
 
-class UISoftKeyboardWidget : public QWidget
-{
-    Q_OBJECT;
- public:
-
-    virtual QSize minimumSizeHint() const
-    {
-        return m_minimumSize;
-    }
-
-    virtual QSize sizeHint() const
-    {
-        return m_minimumSize;
-    }
-
-    void setNewMinimumSize(const QSize &size)
-    {
-        m_minimumSize = size;
-        updateGeometry();
-    }
-    QVector<UISoftKeyboardRow> m_rows;
-
-    void setInitialSize(int iWidth, int iHeight)
-    {
-        m_iInitialWidth = iWidth;
-        m_iInitialHeight = iHeight;
-    }
-
-protected:
-
-    void paintEvent(QPaintEvent *pEvent) /* override */
-    {
-        Q_UNUSED(pEvent);
-        if (m_iInitialWidth == 0 || m_iInitialHeight == 0)
-            return;
-
-        m_fMultiplierX = width() / (float) m_iInitialWidth;
-        m_fMultiplierY = height() / (float) m_iInitialHeight;
-
-        QPainter painter(this);
-        QFont painterFont(font());
-        painterFont.setPixelSize(15);
-        painter.setFont(painterFont);
-        painter.setRenderHint(QPainter::Antialiasing);
-        painter.setPen(QPen(QColor(0, 0,0), 2));
-        painter.setBrush(QBrush(QColor(255, 0,0)));
-        painter.scale(m_fMultiplierX, m_fMultiplierY);
-        for (int i = 0; i < m_rows.size(); ++i)
-        {
-            QVector<UISoftKeyboardKey> &keys = m_rows[i].keys();
-            for (int j = 0; j < keys.size(); ++j)
-            {
-                UISoftKeyboardKey &key = keys[j];
-                painter.translate(key.keyGeometry().x(), key.keyGeometry().y());
-                painter.drawPolygon(key.polygon());
-                QRect textRect(5, 5, key.keyGeometry().width(), key.keyGeometry().height());
-                painter.drawText(textRect, Qt::TextWordWrap, key.keyCap());
-                painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y());
-            }
-        }
-    }
-
-    void mousePressEvent(QMouseEvent *pEvent)
-    {
-        QPoint eventPosition(pEvent->pos().x() / m_fMultiplierX, pEvent->pos().y() / m_fMultiplierY);
-        QWidget::mousePressEvent(pEvent);
-        for (int i = 0; i < m_rows.size(); ++i)
-        {
-            QVector<UISoftKeyboardKey> &keys = m_rows[i].keys();
-            for (int j = 0; j < keys.size(); ++j)
-            {
-                UISoftKeyboardKey &key = keys[j];
-                if (key.polygonInGlobal().containsPoint(eventPosition, Qt::OddEvenFill))
-                {
-                    break;
-                }
-            }
-        }
-    }
-
-private:
-
-    QSize m_minimumSize;
-    int m_iInitialHeight;
-    int m_iInitialWidth;
-    float m_fMultiplierX;
-    float m_fMultiplierY;
-
-};
-
-
 /*********************************************************************************************************************************
 *   UISoftKeyboard implementation.                                                                                  *
@@ -848 +909 @@
 }
 
+void UISoftKeyboard::sltHandleKeyboardLedsChange()
+{
+    // bool fNumLockLed = m_pSession->isNumLock();
+    // bool fCapsLockLed = m_pSession->isCapsLock();
+    // bool fScrollLock = m_pSession->isScrollLock();
+}
+
 void UISoftKeyboard::prepareObjects()
 {
@@ -860 +928 @@
 void UISoftKeyboard::prepareConnections()
 {
+    connect(m_pSession, &UISession::sigKeyboardLedsChange, this, &UISoftKeyboard::sltHandleKeyboardLedsChange);
 }
 

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

@@ -62 +62 @@
     void sltHandleKeyRelease();
     void sltHandleModifierStateChange();
+    void sltHandleKeyboardLedsChange();
 
 private: