Changeset 78663 in vbox for trunk/src

Timestamp:

May 22, 2019 2:24:22 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Adding a small led like indicator to modifiers.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (5 diffs)

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

@@ -19 +19 @@
 #include <QApplication>
 #include <QFile>
+#include <QPainter>
+#include <QStyle>
 #include <QToolButton>
 #include <QXmlStreamReader>
@@ -132 +134 @@
 
     virtual void mousePressEvent(QMouseEvent *pEvent) /* override */;
+    virtual void paintEvent(QPaintEvent *pPaintEvent) /* override */;
 
 private:
@@ -385 +388 @@
 }
 
-// void UISoftKeyboardKey::mouseReleaseEvent(QMouseEvent *pEvent)
-// {
-//     if (m_enmType == UIKeyType_SingleState)
-//     {
-//         QToolButton::mouseReleaseEvent(pEvent);
-//         setState(UIKeyState_NotPressed)
-//     }
-//     else
-//     {
-//         pEvent->accept();
-//     }
-
-// }
+void UISoftKeyboardKey::paintEvent(QPaintEvent *pEvent)
+{
+    QToolButton::paintEvent(pEvent);
+
+    if (m_enmType == UIKeyType_SingleState)
+        return;
+
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+
+    painter.setPen(QPen(QColor(50, 50, 50), 0.2f));
+    if (m_enmState == UIKeyState_NotPressed)
+        painter.setBrush(QColor(100, 100, 100));
+    else if (m_enmState == UIKeyState_Pressed)
+        painter.setBrush(QColor(20, 255, 42));
+    else
+        painter.setBrush(QColor(255, 7, 58));
+
+    int unitSize = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
+
+    float fRadius = 1.1 * unitSize;
+    float fSpace = unitSize;
+    QRectF rectangle(fSpace, fSpace, fRadius, fRadius);
+
+    painter.drawEllipse(rectangle);
+}
 
 void UISoftKeyboardKey::updateState(bool fPressed)
@@ -423 +440 @@
         {
             if (m_enmState == UIKeyState_NotPressed)
-                 m_enmState = UIKeyState_Pressed;
+                 m_enmState = UIKeyState_Locked;
             else
                 m_enmState = UIKeyState_NotPressed;
@@ -442 +459 @@
 
      if (m_enmState == UIKeyState_Pressed)
-         newColor = QColor(255, 0, 0);
+         newColor = QColor(20, 255, 42);
      else
-         newColor = QColor(0, 255, 0);
+         newColor = QColor(255, 7, 58);
 
      setAutoFillBackground(true);
      QPalette currentPalette = palette();
      currentPalette.setColor(QPalette::Button, newColor);
-     currentPalette.setColor(QPalette::ButtonText, newColor);
+
      setPalette(currentPalette);
      update();