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

Timestamp:

Jun 27, 2018 6:29:02 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Adjust icons when moving GUI between screen with different DPI: Chooser pane, additionally to r123233, r123236 and r123238.

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (4 diffs)
• UIGChooserItemMachine.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -30 +30 @@
 
 /* GUI includes: */
-# include "UIGChooser.h"
 # include "UIGChooserItemGroup.h"
 # include "UIGChooserItemMachine.h"
@@ -114 +113 @@
     connect(this, SIGNAL(sigToggleStarted()), model(), SIGNAL(sigToggleStarted()));
     connect(this, SIGNAL(sigToggleFinished()), model(), SIGNAL(sigToggleFinished()), Qt::QueuedConnection);
-    connect(model()->chooser()->selector(), &UISelectorWindow::sigWindowRemapped,
+    connect(gpSelectorWindow, &UISelectorWindow::sigWindowRemapped,
             this, &UIGChooserItemGroup::sltHandleWindowRemapped);
 
@@ -150 +149 @@
     connect(this, SIGNAL(sigToggleStarted()), model(), SIGNAL(sigToggleStarted()));
     connect(this, SIGNAL(sigToggleFinished()), model(), SIGNAL(sigToggleFinished()));
-    connect(model()->chooser()->selector(), &UISelectorWindow::sigWindowRemapped,
+    connect(gpSelectorWindow, &UISelectorWindow::sigWindowRemapped,
             this, &UIGChooserItemGroup::sltHandleWindowRemapped);
 
@@ -556 +555 @@
 {
     const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-    m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(model()->chooser()->window()->windowHandle(),
+    m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(gpSelectorWindow->windowHandle(),
                                                                              QSize(iIconMetric, iIconMetric));
-    m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(model()->chooser()->window()->windowHandle(),
+    m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(gpSelectorWindow->windowHandle(),
                                                                                  QSize(iIconMetric, iIconMetric));
     m_pixmapSizeGroups = m_groupsPixmap.size() / m_groupsPixmap.devicePixelRatio();

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -27 +27 @@
 /* GUI includes: */
 # include "VBoxGlobal.h"
-# include "UIGChooser.h"
 # include "UIGChooserItemGroup.h"
 # include "UIGChooserItemMachine.h"
@@ -63 +62 @@
 
     /* Configure connections: */
-    connect(model()->chooser()->selector(), &UISelectorWindow::sigWindowRemapped,
+    connect(gpSelectorWindow, &UISelectorWindow::sigWindowRemapped,
             this, &UIGChooserItemMachine::sltHandleWindowRemapped);
 
@@ -90 +89 @@
 
     /* Configure connections: */
-    connect(model()->chooser()->selector(), &UISelectorWindow::sigWindowRemapped,
+    connect(gpSelectorWindow, &UISelectorWindow::sigWindowRemapped,
             this, &UIGChooserItemMachine::sltHandleWindowRemapped);
 
@@ -271 +270 @@
     AssertReturnVoid(!stateIcon.isNull());
     const QSize statePixmapSize = QSize(iIconMetric, iIconMetric);
-    const QPixmap statePixmap = stateIcon.pixmap(model()->chooser()->window()->windowHandle(), statePixmapSize);
+    const QPixmap statePixmap = stateIcon.pixmap(gpSelectorWindow->windowHandle(), statePixmapSize);
     /* Update linked values: */
     if (m_statePixmapSize != statePixmapSize)