Changeset 642 for trunk/src/gui/styles/qcommonstyle.cpp

Timestamp:

Mar 6, 2010, 12:32:46 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Use native file icons in standard Qt file dialogs.

File:

• trunk/src/gui/styles/qcommonstyle.cpp (modified) (5 diffs)

trunk/src/gui/styles/qcommonstyle.cpp

@@ -89 +89 @@
 #endif
 
+#ifdef Q_WS_PM
+#   include <qt_os2.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
@@ -3038 +3042 @@
         if (const QStyleOptionToolBar *tbopt = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             if (tbopt->features & QStyleOptionToolBar::Movable) {
-                ///we need to access the widget here because the style option doesn't 
+                ///we need to access the widget here because the style option doesn't
                 //have all the information we need (ie. the layout's margin)
                 const QToolBar *tb = qobject_cast<const QToolBar*>(widget);
@@ -4668 +4672 @@
         break;
 
+#ifdef Q_WS_PM
+    case PM_ButtonIconSize:
+        ret = int(QStyleHelper::dpiScaled(16.));
+    case PM_SmallIconSize:
+        if (QApplication::desktopSettingsAware())
+            ret = WinQuerySysValue(HWND_DESKTOP, SV_CXICON) / 2;
+        else
+            ret = int(QStyleHelper::dpiScaled(16.));
+        break;
+#else
     case PM_ButtonIconSize:
     case PM_SmallIconSize:
         ret = int(QStyleHelper::dpiScaled(16.));
         break;
+#endif
     case PM_IconViewIconSize:
         ret = proxy()->pixelMetric(PM_LargeIconSize, opt, widget);
@@ -4677 +4692 @@
 
     case PM_LargeIconSize:
+#ifdef Q_WS_PM
+        if (QApplication::desktopSettingsAware())
+            ret = WinQuerySysValue(HWND_DESKTOP, SV_CXICON);
+        else
+            ret = int(QStyleHelper::dpiScaled(32.));
+#else
         ret = int(QStyleHelper::dpiScaled(32.));
+#endif
         break;
 
@@ -5954 +5976 @@
         break;
     }
+#if defined(Q_WS_PM)
+    if (QApplication::desktopSettingsAware() && !icon.isNull()) {
+        // make sure the file dialog related icons have a size not smaller than
+        // the system icon size by centering them (this makes sure the
+        // corresponding items are aligned with file items with system icons)
+        switch (standardIcon) {
+        case SP_DriveCDIcon:
+        case SP_DriveDVDIcon:
+        case SP_DriveNetIcon:
+        case SP_DriveHDIcon:
+        case SP_DriveFDIcon:
+        case SP_FileIcon:
+        case SP_FileLinkIcon:
+        case SP_DirLinkIcon:
+        case SP_DirClosedIcon:
+        case SP_DesktopIcon:
+        case SP_ComputerIcon:
+        case SP_DirOpenIcon:
+        case SP_FileDialogNewFolder:
+        case SP_DirHomeIcon:
+        case SP_TrashIcon: {
+            static QIcon::Mode modes[] = { QIcon::Normal, QIcon::Active,
+                                           QIcon::Disabled, QIcon::Selected };
+            static QIcon::State states[] = { QIcon::Off, QIcon::On };
+            int small = pixelMetric(PM_SmallIconSize);
+            int large = pixelMetric(PM_LargeIconSize);
+            for (size_t m = 0; m < sizeof(modes)/sizeof(modes[0]); ++m) {
+                for (size_t s = 0; s < sizeof(states)/sizeof(states[0]); ++s) {
+                    QIcon::Mode mm = modes[m];
+                    QIcon::State ss = states[s];
+                    QList<QSize> sizes = icon.availableSizes(mm, ss);
+                    QSize smallSz, largeSz;
+                    foreach(const QSize &asz, sizes) {
+                        if (asz.width() < small)
+                            smallSz = asz;
+                        else if (asz.width() < large)
+                            largeSz = asz;
+                        else
+                            break;
+                    }
+                    if (smallSz.isValid()) {
+                        QPixmap pixmap = icon.pixmap(smallSz, mm, ss);
+                        QPixmap centered(small, small);
+                        centered.fill(Qt::transparent);
+                        QPainter painter(&centered);
+                        int x = (small - pixmap.width()) / 2;
+                        int y = (small - pixmap.height()) / 2;
+                        painter.drawPixmap(x, y, pixmap);
+                        painter.end();
+                        icon.addPixmap(centered, mm, ss);
+                    }
+                    if (largeSz.isValid()) {
+                        QPixmap pixmap = icon.pixmap(largeSz, mm, ss);
+                        QPixmap centered(large, large);
+                        centered.fill(Qt::transparent);
+                        QPainter painter(&centered);
+                        int x = (large - pixmap.width()) / 2;
+                        int y = (large - pixmap.height()) / 2;
+                        painter.drawPixmap(x, y, pixmap);
+                        painter.end();
+                        icon.addPixmap(centered, mm, ss);
+                    }
+
+                }
+            }
+            break;
+        }
+        default:
+            break;
+        }
+    }
+#endif
     return icon;
 }