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

Timestamp:

Jun 27, 2018 5:51:55 PM (7 years ago)

Author:

vboxsync

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

123238

Message:

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

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (9 diffs)
• UIGChooserItemGroup.h (modified) (3 diffs)
• UIGChooserItemMachine.cpp (modified) (1 diff)
• UIGChooserItemMachine.h (modified) (1 diff)

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

@@ -30 +30 @@
 
 /* GUI includes: */
+# include "UIGChooser.h"
 # include "UIGChooserItemGroup.h"
 # include "UIGChooserItemMachine.h"
 # include "UIGChooserModel.h"
+# include "UIGChooserView.h"
+# include "UIGraphicsRotatorButton.h"
 # include "UIIconPool.h"
-# include "UIGraphicsRotatorButton.h"
-# include "UIGChooserView.h"
+# include "UISelectorWindow.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -112 +114 @@
     connect(this, SIGNAL(sigToggleStarted()), model(), SIGNAL(sigToggleStarted()));
     connect(this, SIGNAL(sigToggleFinished()), model(), SIGNAL(sigToggleFinished()), Qt::QueuedConnection);
+    connect(model()->chooser()->selector(), &UISelectorWindow::sigWindowRemapped,
+            this, &UIGChooserItemGroup::sltHandleWindowRemapped);
 
     /* Translate finally: */
@@ -117 +121 @@
 
     /* Init: */
+    updatePixmaps();
     updateItemCountInfo();
     updateVisibleName();
@@ -145 +150 @@
     connect(this, SIGNAL(sigToggleStarted()), model(), SIGNAL(sigToggleStarted()));
     connect(this, SIGNAL(sigToggleFinished()), model(), SIGNAL(sigToggleFinished()));
+    connect(model()->chooser()->selector(), &UISelectorWindow::sigWindowRemapped,
+            this, &UIGChooserItemGroup::sltHandleWindowRemapped);
 
     /* Copy content to 'this': */
@@ -153 +160 @@
 
     /* Init: */
+    updatePixmaps();
     updateItemCountInfo();
     updateVisibleName();
@@ -274 +282 @@
     /* Found nothing? */
     return false;
+}
+
+void UIGChooserItemGroup::sltHandleWindowRemapped()
+{
+    /* Update pixmaps: */
+    updatePixmaps();
 }
 
@@ -410 +424 @@
     m_nameFont.setWeight(QFont::Bold);
     m_infoFont = font();
-    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-    m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(iIconMetric, iIconMetric);
-    m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(iIconMetric, iIconMetric);
-    m_pixmapSizeGroups = m_groupsPixmap.size() / m_groupsPixmap.devicePixelRatio();
-    m_pixmapSizeMachines = m_machinesPixmap.size() / m_machinesPixmap.devicePixelRatio();
     m_minimumHeaderSize = QSize(0, 0);
 
@@ -542 +551 @@
         update();
     }
+}
+
+void UIGChooserItemGroup::updatePixmaps()
+{
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(model()->chooser()->window()->windowHandle(),
+                                                                             QSize(iIconMetric, iIconMetric));
+    m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(model()->chooser()->window()->windowHandle(),
+                                                                                 QSize(iIconMetric, iIconMetric));
+    m_pixmapSizeGroups = m_groupsPixmap.size() / m_groupsPixmap.devicePixelRatio();
+    m_pixmapSizeMachines = m_machinesPixmap.size() / m_machinesPixmap.devicePixelRatio();
 }
 
@@ -1485 +1505 @@
 }
 
+void UIGChooserItemGroup::showEvent(QShowEvent *pEvent)
+{
+    /* Call to base-class: */
+    UIGChooserItem::showEvent(pEvent);
+
+    /* Update pixmaps: */
+    updatePixmaps();
+}
+
 void UIGChooserItemGroup::resizeEvent(QGraphicsSceneResizeEvent *pEvent)
 {

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

@@ -84 +84 @@
 private slots:
 
+    /** Handles top-level window remaps. */
+    void sltHandleWindowRemapped();
+
     /* Handler: Name editing stuff: */
     void sltNameEditingFinished();
@@ -118 +121 @@
     void handleRootStatusChange();
     void updateVisibleName();
+    void updatePixmaps();
     void updateItemCountInfo();
     void updateMinimumHeaderSize();
@@ -167 +171 @@
     void resetDragToken();
     QMimeData* createMimeData();
+
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
 
     /* Handler: Resize handling stuff: */

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

@@ -26 +26 @@
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
 # include "UIGChooser.h"
+# include "UIGChooserItemGroup.h"
 # include "UIGChooserItemMachine.h"
-# include "UIGChooserItemGroup.h"
 # include "UIGChooserModel.h"
 # include "UIGraphicsToolBar.h"
+# include "UIActionPoolSelector.h"
 # include "UIGraphicsZoomButton.h"
-# include "VBoxGlobal.h"
 # include "UIIconPool.h"
-# include "UIActionPoolSelector.h"
 # include "UIImageTools.h"
 # include "UISelectorWindow.h"

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

@@ -69 +69 @@
                                       int iEnumerationFlags = 0);
 
-public slots:
+private slots:
 
     /** Handles top-level window remaps. */