Changeset 764 for trunk/src

Timestamp:

Jul 29, 2010, 3:41:39 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QCommonStyle::standardIconImplementation(): Generate the stanrad small and/or large icon size if it is missing from the stock icon (to avoid icon size differences in e.g. file dialogs).

File:

• trunk/src/gui/styles/qcommonstyle.cpp (modified) (1 diff)

trunk/src/gui/styles/qcommonstyle.cpp

@@ -6009 +6009 @@
                     QSize smallSz, largeSz;
                     foreach(const QSize &asz, sizes) {
-                        if (asz.width() < small)
+                        if (asz.width() < small && asz.width() > smallSz.width())
                             smallSz = asz;
-                        else if (asz.width() < large)
+                        else if (asz.width() < large && asz.width() > largeSz.width())
                             largeSz = asz;
-                        else
-                            break;
+                    }
+                    if (smallSz.isValid() && !largeSz.isValid()) {
+                        // add the large icon if missing by up-scaling the small one by 2
+                        QPixmap p = icon.pixmap(smallSz, mm, ss);
+                        largeSz = smallSz * 2;
+                        icon.addPixmap(p.scaled(largeSz, Qt::KeepAspectRatio,
+                                                Qt::SmoothTransformation));
+                    } else if (largeSz.isValid() && !smallSz.isValid()) {
+                        // add the small icon if missing by down-scaling the large one by 2
+                        QPixmap p = icon.pixmap(largeSz, mm, ss);
+                        largeSz = largeSz / 2;
+                        icon.addPixmap(p.scaled(smallSz, Qt::KeepAspectRatio,
+                                                Qt::SmoothTransformation));
                     }
                     if (smallSz.isValid()) {