Changeset 72710 in vbox

Timestamp:

Jun 27, 2018 6:30:08 PM (7 years ago)

Author:

vboxsync

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

123240

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details

Files:

• UIGDetailsElement.cpp (modified) (7 diffs)
• UIGDetailsElement.h (modified) (3 diffs)
• UIGDetailsElements.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -35 +35 @@
 # include "UIGraphicsTextPane.h"
 # include "UIActionPool.h"
+# include "UIConverter.h"
 # include "UIIconPool.h"
-# include "UIConverter.h"
+# include "UISelectorWindow.h"
 # include "VBoxGlobal.h"
 
@@ -131 +132 @@
 }
 
+void UIGDetailsElement::sltHandleWindowRemapped()
+{
+    /* Update icon: */
+    updateIcon();
+}
+
 void UIGDetailsElement::sltToggleButtonClicked()
 {
@@ -197 +204 @@
     /* Update current machine mount-target: */
     vboxGlobal().updateMachineStorage(machine(), target);
+}
+
+void UIGDetailsElement::showEvent(QShowEvent *pEvent)
+{
+    /* Call to base-class: */
+    UIGDetailsItem::showEvent(pEvent);
+
+    /* Update icon: */
+    updateIcon();
 }
 
@@ -242 +258 @@
 }
 
-void UIGDetailsElement::setIcon(const QIcon &icon)
-{
+void UIGDetailsElement::updateIcon()
+{
+    /* Prepare whole icon first of all: */
+    const QIcon icon = gpConverter->toIcon(elementType());
+
     /* Cache icon: */
     if (icon.isNull())
@@ -253 +272 @@
     else
     {
-        /* Determine default the icon size: */
-        const QStyle *pStyle = QApplication::style();
-        const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+        /* Determine default icon size: */
+        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
         m_pixmapSize = QSize(iIconMetric, iIconMetric);
-        /* Acquire the icon of the corresponding size: */
-        m_pixmap = icon.pixmap(m_pixmapSize);
+        /* Acquire the icon of corresponding size (taking top-level widget DPI into account): */
+        m_pixmap = icon.pixmap(gpSelectorWindow->windowHandle(), m_pixmapSize);
     }
 
@@ -412 +430 @@
     m_textFont = font();
 
+    /* Update icon: */
+    updateIcon();
+
     /* Create highlight machine: */
     m_pHighlightMachine = new QStateMachine(this);
@@ -444 +465 @@
     m_pHighlightMachine->start();
 
-    connect(this, SIGNAL(sigToggleElement(DetailsElementType, bool)), model(), SLOT(sltToggleElements(DetailsElementType, bool)));
+    /* Configure connections: */
+    connect(gpSelectorWindow, &UISelectorWindow::sigWindowRemapped,
+            this, &UIGDetailsElement::sltHandleWindowRemapped);
+    connect(this, SIGNAL(sigToggleElement(DetailsElementType, bool)),
+            model(), SLOT(sltToggleElements(DetailsElementType, bool)));
     connect(this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
             model(), SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)));

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h

@@ -93 +93 @@
 protected slots:
 
+    /** Handles top-level window remaps. */
+    void sltHandleWindowRemapped();
+
     /* Handlers: Toggle stuff: */
     void sltToggleButtonClicked();
@@ -117 +120 @@
     };
 
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
+
     /** This event handler is delivered after the widget has been resized. */
     void resizeEvent(QGraphicsSceneResizeEvent *pEvent);
@@ -131 +137 @@
 
     /* API: Icon stuff: */
-    void setIcon(const QIcon &icon);
+    void updateIcon();
 
     /* API: Name stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -66 +66 @@
     , m_pTask(0)
 {
-    /* Assign corresponding icon: */
-    setIcon(gpConverter->toIcon(elementType()));
-
     /* Listen for the global thread-pool: */
     connect(vboxGlobal().threadPool(), SIGNAL(sigTaskComplete(UITask*)),
@@ -124 +121 @@
     : UIGDetailsElement(pParent, DetailsElementType_Preview, fOpened)
 {
-    /* Assign corresponding icon: */
-    setIcon(gpConverter->toIcon(elementType()));
-
     /* Create preview: */
     m_pPreview = new UIGMachinePreview(this);