From 5a0eb4e768435b9ce32b074e620fca33be4df2fb Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 27 Feb 2012 12:38:04 +0100
Subject: Fix icon loading in style sheets.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QIcon was moved to QtWidgets, while the parser is still in QtGui.
Introduce a QCss::IconValue struct that contains the icon data
and convert to QIcon in widgets.

Change-Id: I09ac8a12a4b02bdca91ee2e8fcc28c86b5a001e7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/gui/text/qcssparser.cpp | 40 ++++++++++++++--------------------------
 src/gui/text/qcssparser_p.h | 21 +++++++++++++++++++--
 2 files changed, 33 insertions(+), 28 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 38070458b7..fd01934eae 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -1272,11 +1272,9 @@ void ValueExtractor::extractFont()
     extractFont(&f, &dummy);
 }
 
-bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size)
+bool ValueExtractor::extractImage(QCss::IconValue *icon, Qt::Alignment *a, QSize *size)
 {
     bool hit = false;
-#if 0
-    // ### Qt5
     for (int i = 0; i < declarations.count(); ++i) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
@@ -1297,7 +1295,6 @@ bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size)
         }
         hit = true;
     }
-#endif
     return hit;
 }
 
@@ -1646,30 +1643,27 @@ void Declaration::borderImageValue(QString *image, int *cuts,
         *h = *v;
 }
 
-#if 0
-// ### Qt 5
-QIcon Declaration::iconValue() const
+IconValue Declaration::iconValue() const
 {
     if (d->parsed.isValid())
-        return qvariant_cast<QIcon>(d->parsed);
+        return qvariant_cast<IconValue>(d->parsed);
 
-    QIcon icon;
+    IconValue icon;
     for (int i = 0; i < d->values.count();) {
         const Value &value = d->values.at(i++);
         if (value.type != Value::Uri)
             break;
-        QString uri = value.variant.toString();
-        QIcon::Mode mode = QIcon::Normal;
-        QIcon::State state = QIcon::Off;
+        IconValue::IconEntry entry;
+        entry.uri = value.variant.toString();
         for (int j = 0; j < 2; j++) {
             if (i != d->values.count() && d->values.at(i).type == Value::KnownIdentifier) {
                 switch (d->values.at(i).variant.toInt()) {
-                case Value_Disabled: mode = QIcon::Disabled; break;
-                case Value_Active: mode = QIcon::Active; break;
-                case Value_Selected: mode = QIcon::Selected; break;
-                case Value_Normal: mode = QIcon::Normal; break;
-                case Value_On: state = QIcon::On; break;
-                case Value_Off: state = QIcon::Off; break;
+                case Value_Disabled: entry.mode = IconValue::Disabled; break;
+                case Value_Active: entry.mode = IconValue::Active; break;
+                case Value_Selected: entry.mode = IconValue::Selected; break;
+                case Value_Normal: entry.mode = IconValue::Normal; break;
+                case Value_On: entry.state = IconValue::On; break;
+                case Value_Off: entry.state = IconValue::Off; break;
                 default: break;
                 }
                 ++i;
@@ -1677,12 +1671,7 @@ QIcon Declaration::iconValue() const
                 break;
             }
         }
-
-        // QIcon is soo broken
-        if (icon.isNull())
-            icon = QIcon(uri);
-        else
-            icon.addPixmap(uri, mode, state);
+        icon.entries.push_back(entry);
 
         if (i == d->values.count())
             break;
@@ -1691,10 +1680,9 @@ QIcon Declaration::iconValue() const
             i++;
     }
 
-    d->parsed = QVariant::fromValue<QIcon>(icon);
+    d->parsed = QVariant::fromValue<QCss::IconValue>(icon);
     return icon;
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Selector
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index d50b87dcd5..b19fd8326e 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -411,6 +411,22 @@ struct BorderData {
     BrushData color;
 };
 
+struct Q_GUI_EXPORT IconValue
+{
+    enum Mode { Normal, Disabled, Active, Selected }; // In sync with QIcon.
+    enum State { On, Off };
+
+    struct Q_GUI_EXPORT IconEntry
+    {
+        IconEntry() : mode(Normal) , state(On) {}
+
+        Mode mode;
+        State state;
+        QString uri;
+    };
+
+    QList<IconEntry> entries;
+};
 
 // 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; }
 // 2. QVector<Selector> - x:hover, y:clicked z:checked
@@ -455,7 +471,7 @@ struct Q_GUI_EXPORT Declaration
     QSize sizeValue() const;
     QRect rectValue() const;
     QString uriValue() const;
-//    QIcon iconValue() const;
+    IconValue iconValue() const;
 
     void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
 };
@@ -582,7 +598,7 @@ struct Q_GUI_EXPORT ValueExtractor
     bool extractOutline(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, int *offsets);
     bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg);
     int  extractStyleFeatures();
-    bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size);
+    bool extractImage(QCss::IconValue *icon, Qt::Alignment *a, QSize *size);
 
     int lengthValue(const Declaration &decl);
 
@@ -842,6 +858,7 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE( QCss::BackgroundData )
 Q_DECLARE_METATYPE( QCss::LengthData )
 Q_DECLARE_METATYPE( QCss::BorderData )
+Q_DECLARE_METATYPE( QCss::IconValue )
 
 
 #endif // QT_NO_CSSPARSER
-- 
cgit v1.2.3