Changeset 651 for trunk/src/gui/styles/qs60style_s60.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/styles/qs60style_s60.cpp (modified) (14 diffs)

trunk/src/gui/styles/qs60style_s60.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -64 +64 @@
 #include <aknnavi.h>
 #include <gulicon.h>
+
 
 #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
@@ -73 +74 @@
     EDrawGulIcon,
     EDrawBackground,
+
     ENoDraw
 };
@@ -98 +100 @@
 } partMapEntry;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class QS60StyleModeSpecifics
 {
@@ -114 +157 @@
     static TAknsItemID partSpecificThemeId(int part);
 
+
+
 private:
     static QPixmap createSkinnedGraphicsLX(QS60StyleEnums::SkinParts part,
@@ -129 +174 @@
 
 const partMapEntry QS60StyleModeSpecifics::m_partMap[] = {
-    /* SP_QgnGrafBarWait */                {KAknsIIDQgnGrafBarWaitAnim,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafBarWaiton,   ES60_All,    -1,-1},
     /* SP_QgnGrafBarFrameCenter */         {KAknsIIDQgnGrafBarFrameCenter,         EDrawIcon,   ES60_All,    -1,-1},
     /* SP_QgnGrafBarFrameSideL */          {KAknsIIDQgnGrafBarFrameSideL,          EDrawIcon,   ES60_All,    -1,-1},
@@ -372 +417 @@
 {
     switch(stylePart) {
-        case QS60StyleEnums::SP_QgnGrafBarWait:
+        case QS60StyleEnums::SP_QgnGrafBarWait:
             fallbackIndex = EMbmAvkonQgn_graf_bar_wait_1;
             break;
@@ -605 +650 @@
 }
 
+
+
+
+
+
 QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
 {
@@ -710 +760 @@
             break;
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
     if (!result)
@@ -732 +845 @@
     QPixmap result;
 
-//        QS60WindowSurface::unlockBitmapHeap();
     static const TDisplayMode displayMode = S60->supportsPremultipliedAlpha ? Q_SYMBIAN_ECOLOR16MAP : EColor16MA;
     static const TInt drawParam = S60->supportsPremultipliedAlpha ? KAknsDrawParamDefault : KAknsDrawParamNoClearUnderImage|KAknsDrawParamRGBOnly;
@@ -910 +1022 @@
 
 QFont QS60StylePrivate::s60Font_specific(
-    QS60StyleEnums::FontCategories fontCategory, int pointSize)
-{
+    QS60StyleEnums::FontCategories fontCategory,
+    int pointSize, bool resolveFontSize)
+{
+    Q_UNUSED(resolveFontSize);
+
     TAknFontCategory aknFontCategory = EAknFontCategoryUndefined;
     switch (fontCategory) {
@@ -983 +1098 @@
 }
 
+
+
 QS60StylePrivate::QS60StylePrivate()
 {
+
+
+
     // No need to set active layout, if dynamic metrics API is available
     setActiveLayout();
@@ -1185 +1305 @@
         topLevelWidget->ensurePolished();
     }
+
+
+
+
+
 }
 
@@ -1204 +1329 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif // Q_WS_S60