Changeset 70543 in vbox for trunk/src/VBox

Timestamp:

Jan 11, 2018 3:48:54 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Selector UI: Fully scaleable main toolbar contents, useful for HiDPI case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (1 diff)
• UIToolsToolbar.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1850 +1850 @@
     {
         /* Configure toolbar: */
+        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
         m_pToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         m_pToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-        /// @todo Get rid of hard-coded stuff:
-        const QSize toolBarIconSize = m_pToolBar->iconSize();
-        if (toolBarIconSize.width() < 32 || toolBarIconSize.height() < 32)
-            m_pToolBar->setIconSize(QSize(32, 32));
 
         /* Add main actions block: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp

@@ -25 +25 @@
 # include <QHBoxLayout>
 # include <QLabel>
+# include <QStyle>
 # include <QToolButton>
 
@@ -275 +276 @@
         {
             /* Configure toolbar: */
+            const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+            m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
             m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-            /// @todo Get rid of hard-coded stuff:
-            const QSize toolBarIconSize = m_pToolBar->iconSize();
-            if (toolBarIconSize.width() < 32 || toolBarIconSize.height() < 32)
-                m_pToolBar->setIconSize(QSize(32, 32));
 
             /* Add actions: */