Changeset 72715 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 28, 2018 10:21:28 AM (7 years ago)

Author:

vboxsync

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

123249

Message:

FE/Qt: bugref:8694: Adjust icons when moving GUI between screen with different DPI: UITabBar.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

@@ -104 +104 @@
 protected:
 
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) /* override */;
+
     /** Handles translation event. */
     virtual void retranslateUi() /* override */;
@@ -130 +133 @@
     /** Prepares all. */
     void prepare();
+    /** Update pixmap. */
+    void updatePixmap();
 
     /** Holds the item ID. */
@@ -212 +217 @@
     /* And call for repaint: */
     update();
+}
+
+bool UITabBarItem::event(QEvent *pEvent)
+{
+    /* Handle know event types: */
+    switch (pEvent->type())
+    {
+        case QEvent::Show:
+        case QEvent::ScreenChangeInternal:
+        {
+            /* Update pixmap: */
+            updatePixmap();
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Call to base-class: */
+    return QIWithRetranslateUI<QWidget>::event(pEvent);
 }
 
@@ -552 +577 @@
     pDrag->setMimeData(pMimeData);
     const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-    pDrag->setPixmap(m_pAction->icon().pixmap(iMetric, iMetric));
+    pDrag->setPixmap(m_pAction->icon().pixmap(window()->windowHandle(), QSize(iMetric, iMetric)));
     pDrag->exec();
 }
@@ -593 +618 @@
     /* Create main layout: */
     m_pLayout = new QHBoxLayout(this);
-    AssertPtrReturnVoid(m_pLayout);
+    if (m_pLayout)
     {
         /* Invent pixel metric: */
@@ -619 +644 @@
         /* Create icon label: */
         m_pLabelIcon = new QLabel;
-        AssertPtrReturnVoid(m_pLabelIcon);
+        if (m_pLabelIcon)
         {
             /* Configure label: */
             m_pLabelIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-            m_pLabelIcon->setPixmap(m_pAction->icon().pixmap(iMetric));
         }
 
         /* Create name label: */
         m_pLabelName = new QLabel;
-        AssertPtrReturnVoid(m_pLabelName);
+        if (m_pLabelName)
         {
             /* Configure label: */
@@ -636 +660 @@
         /* Create close button: */
         m_pButtonClose = new QToolButton;
-        AssertPtrReturnVoid(m_pButtonClose);
+        if (m_pButtonClose)
         {
             /* Configure button: */
@@ -653 +677 @@
         /* Create stacked-layout: */
         m_pLayoutStacked = new QStackedLayout(m_pLayout);
+        if (m_pLayoutStacked)
         {
             m_pLayoutStacked->setAlignment(Qt::AlignCenter);
@@ -676 +701 @@
     }
 
+    /* Update pixmap: */
+    updatePixmap();
+
     /* Apply language settings: */
     retranslateUi();
+}
+
+void UITabBarItem::updatePixmap()
+{
+    /* Configure label icon: */
+    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    m_pLabelIcon->setPixmap(m_pAction->icon().pixmap(window()->windowHandle(), QSize(iMetric, iMetric)));
 }