Changeset 101658 in vbox for trunk/src

Timestamp:

Oct 30, 2023 1:38:39 PM (16 months ago)

Author:

vboxsync

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

159747

Message:

FE/Qt: bugref:6143. Drawing soft keyboard's multimedia keys resolution aware.

File:

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

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

@@ -402 +402 @@
   * The position of a key within the physical layout is read from the layout file. Note that UISoftKeyboardKey usually does not have
   * caption field(s). Captions are kept by UISoftKeyboardLayout since same keys may (and usually do) have different captions in
-  * different layouts. So called static captions are exections. They are defined in physical layout files and kept as member of
+  * different layouts. So called static captions are exceptions. They are defined in physical layout files and kept as member of
   * UISoftKeyboardKey. When a static caption exits captions (if any) from the keyboard layout files are ignored. */
 class UISoftKeyboardKey
@@ -449 +449 @@
 
     void setImageByName(const QString &strCaption);
-    const QImage &image() const;
+    QPixmap image() const;
 
     void setParentWidget(UISoftKeyboardWidget* pParent);
@@ -517 +517 @@
     bool    m_fIsOSMenuKey;
     double  m_fCornerRadius;
-    QImage  m_image;
+    QIcon   m_icon;
 };
 
@@ -1733 +1733 @@
     if (strImageFileName.isEmpty())
         return;
-    m_image = QImage(QString(":/%1").arg(strImageFileName));
-}
-
-const QImage &UISoftKeyboardKey::image() const
-{
-    return m_image;
+    m_icon = UIIconPool::iconSet(QString(":/%1").arg(strImageFileName));
+}
+
+QPixmap UISoftKeyboardKey::image() const
+{
+    QPixmap pixmap;
+
+    /* Check whether we have valid icon: */
+    if (!m_icon.isNull())
+    {
+        /* Determine desired icon size: */
+        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+        const QSize iconSize = QSize(iIconMetric, iIconMetric);
+        /* Get pixmap of requested size (take into account the DPI of the main shown window, if possible): */
+        const qreal fDevicePixelRatio = windowManager().mainWindowShown() && windowManager().mainWindowShown()->windowHandle()
+                                      ? windowManager().mainWindowShown()->windowHandle()->devicePixelRatio() : 1;
+        pixmap = m_icon.pixmap(iconSize, fDevicePixelRatio);
+    }
+
+    return pixmap;
 }
 
@@ -2185 +2199 @@
     int iMargin = 0.1 * qMax(keyGeometry.width(), keyGeometry.height());
     int size = qMin(keyGeometry.width() - 2 * iMargin, keyGeometry.height() - 2 * iMargin);
-    painter.drawImage(QRect(0.5 * (keyGeometry.width() - size), 0.5 * (keyGeometry.height() - size),
+    painter.drawPixmap(QRect(0.5 * (keyGeometry.width() - size), 0.5 * (keyGeometry.height() - size),
                             size, size), key.image());
 }