FCL/sf/mw/qt: comparison src/gui/styles/qs60style

equal deleted inserted replaced

-:dee5afe5301f
+:3f74d0d4af4c
 #include "private/qpixmap_s60_p.h"
 #include "private/qcore_symbian_p.h"
 #include "qapplication.h"
 #include <w32std.h>
-#include <aknsconstants.h>
+#include <AknsConstants.h>
 #include <aknconsts.h>
-#include <aknsitemid.h>
+#include <AknsItemID.h>
-#include <aknsutils.h>
+#include <AknsUtils.h>
-#include <aknsdrawutils.h>
+#include <AknsDrawUtils.h>
-#include <aknsskininstance.h>
+#include <AknsSkinInstance.h>
-#include <aknsbasicbackgroundcontrolcontext.h>
+#include <AknsBasicBackgroundControlContext.h>
 #include <avkon.mbg>
 #include <AknFontAccess.h>
 #include <AknLayoutFont.h>
-#include <aknutils.h>
+#include <AknUtils.h>
 #include <aknnavi.h>
 #include <gulicon.h>
 #include <AknBitmapAnimation.h>
 #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
 /* SP_QgnGrafBarWaitAnim */            {KAknsIIDQgnGrafBarWaitAnim,       EDrawAnimation,   ES60_All,    -1,-1},
 /* SP_QgnGrafBarFrameCenter */         {KAknsIIDQgnGrafBarFrameCenter,         EDrawIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafBarFrameSideL */          {KAknsIIDQgnGrafBarFrameSideL,          EDrawIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafBarFrameSideR */          {KAknsIIDQgnGrafBarFrameSideR,          EDrawIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafBarProgress */            {KAknsIIDQgnGrafBarProgress,            EDrawIcon,   ES60_All,    -1,-1},
+// No drop area for 3.x non-touch devices
+/* SP_QgnGrafOrgBgGrid */              {KAknsIIDNone,                          EDrawIcon,   ES60_3_X,    EAknsMajorGeneric ,0x1eba}, //KAknsIIDQgnGrafOrgBgGrid
 /* SP_QgnGrafScrollArrowDown */        {KAknsIIDQgnGrafScrollArrowDown,     EDrawGulIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafScrollArrowLeft */        {KAknsIIDQgnGrafScrollArrowLeft,     EDrawGulIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafScrollArrowRight */       {KAknsIIDQgnGrafScrollArrowRight,    EDrawGulIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafScrollArrowUp */          {KAknsIIDQgnGrafScrollArrowUp,       EDrawGulIcon,   ES60_All,    -1,-1},
 /* SP_QgnGrafTabActiveL */             {KAknsIIDQgnGrafTabActiveL,             EDrawIcon,   ES60_All,    -1,-1},
 targetSize,
 KAknsDrawParamDefault | KAknsDrawParamRGBOnly);
 if (drawn)
 result = fromFbsBitmap(background, NULL, flags, targetSize);
-// if drawing fails in skin server, just ignore the background (probably OOM occured)
+// if drawing fails in skin server, just ignore the background (probably OOM case)
 CleanupStack::PopAndDestroy(4, background); //background, dev, gc, bgContext
 //        QS60WindowSurface::lockBitmapHeap();
 break;
 }
 constructedFromTheme = !animation->isResourceBased();
 }
 const int currentFrame = QS60StylePrivate::currentAnimationFrame(part);
 if (constructedFromTheme && aknAnimation && aknAnimation->BitmapAnimData()->FrameArray().Count() > 0) {
-//Animation was created succesfully and contains frames, just fetch current frame
+//Animation was created successfully and contains frames, just fetch current frame
 if(currentFrame >= aknAnimation->BitmapAnimData()->FrameArray().Count())
 User::Leave(KErrOverflow);
 const CBitmapFrameData* frameData = aknAnimation->BitmapAnimData()->FrameArray().At(currentFrame);
 if (frameData) {
 animationFrame = frameData->Bitmap();
 CleanupStack::PushL(bitmapDev);
 CFbsBitGc* bitmapGc = NULL;
 User::LeaveIfError(bitmapDev->CreateContext(bitmapGc));
 CleanupStack::PushL(bitmapGc);
-#ifndef Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
 frame->LockHeap();
 memset(frame->DataAddress(), 0, frame->SizeInPixels().iWidth * frame->SizeInPixels().iHeight * 4);  // 4: argb bytes
 frame->UnlockHeap();
-#endif
 const TRect outerRect(TPoint(0, 0), targetSize);
 const TRect innerRect = innerRectFromElement(frameElement, outerRect);
 TAknsItemID frameSkinID, centerSkinID;
 }
 }
 TRect QS60StyleModeSpecifics::innerRectFromElement(QS60StylePrivate::SkinFrameElements frameElement, const TRect &outerRect)
 {
-TInt widthShrink = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth);
+TInt widthShrink = QS60StylePrivate::pixelMetric(PM_FrameCornerWidth);
-TInt heightShrink = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerHeight);
+TInt heightShrink = QS60StylePrivate::pixelMetric(PM_FrameCornerHeight);
 switch(frameElement) {
 case QS60StylePrivate::SF_PanelBackground:
 // panel should have slightly slimmer border to enable thin line of background graphics between closest component
-widthShrink = widthShrink-2;
+widthShrink = widthShrink - 2;
-heightShrink = heightShrink-2;
+heightShrink = heightShrink - 2;
 break;
 case QS60StylePrivate::SF_ToolTip:
-widthShrink = widthShrink>>1;
+widthShrink = widthShrink >> 1;
-heightShrink = heightShrink>>1;
+heightShrink = heightShrink >> 1;
 break;
 case QS60StylePrivate::SF_ListHighlight:
-widthShrink = widthShrink-2;
+widthShrink = widthShrink - 2;
-heightShrink = heightShrink-2;
+heightShrink = heightShrink - 2;
+break;
+case QS60StylePrivate::SF_PopupBackground:
+widthShrink = widthShrink + 5;
+heightShrink = heightShrink + 5;
 break;
 default:
 break;
 }
 TRect innerRect(outerRect);
 activeLayoutIndex = (currentRelease == QSysInfo::SV_S60_3_1 || currentRelease == QSysInfo::SV_S60_3_2) ? 0 : 2;
 activeLayoutIndex += (!landscape) ? 1 : 0;
 }
-m_pmPointer = data[activeLayoutIndex];
+setCurrentLayout(activeLayoutIndex);
 }
 Q_GLOBAL_STATIC(QList<QS60StyleAnimation *>, m_animations)
 QS60StylePrivate::QS60StylePrivate()
 &KAknsIIDQsnLineColors,
 &KAknsIIDQsnOtherColors,
 &KAknsIIDQsnParentColors,
 &KAknsIIDQsnTextColors
 };
-Q_ASSERT((int)list <= (int)sizeof(idMap)/sizeof(idMap[0]));
+Q_ASSERT((int)list < (int)sizeof(idMap)/sizeof(idMap[0]));
 const QColor color = QS60StyleModeSpecifics::colorValue(*idMap[(int) list], index - 1);
 return option ? QS60StylePrivate::stateColor(color, option) : color;
 }
 // In some cases, the AVKON UI themegraphic is already in 'disabled state'.

branch	RCL_3
changeset 8	3f74d0d4af4c
parent 5	d3bac044e0f0
child 14	c0432d11811c