FCL/sf/mw/hb: comparison src/hbcore/image/hbiconloader.cpp

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
 #include <hbiconloader_p.h>
+#include "hbthemecommon_p.h"
 #include <QDir>
 #include <QCoreApplication>
 #include <QDebug>
 #include <QPicture>
 static QString removeIconNameSuffix(const QString &iconName);
 /* This method is supposed to work the same way
 as the FindIconHelper in the Icon Theme Spec: */
-static QString findIconHelper(const QString &iconName,
+static QString findSharedResourceHelper(const QString &resourceName,
 bool mirrored,
 bool& mirroredIconFound,
+Hb::ResourceType itemType = Hb::IconResource,
 bool useThemeIndex = true);
 static QString findEffectHelper(const QString &effectName);
 bool isAutomaticallyMirrored(const QString &iconName);
 QByteArray createCacheKeyFrom( const QString &iconName,
 const QSizeF &size,
 Qt::AspectRatioMode aspectRatioMode,
 QIcon::Mode mode,
 bool mirrored,
-const QColor &color);
+const QColor &color,
-#endif
+HbRenderingMode renderMode);
+#endif
-private:
-void createMirroredList();
 public: // data
 QString storedTheme;
-/*
-* List of icons that should be mirrored automatically in a mirrored layout.
-* This is initially read from a config file "mirrored.txt".
-*/
-QStringList mirroredList;
-bool mirroredListCreated;
 int sourceResolution;
 int resolution;
 qreal zoom;
 // Frame-by-frame animation support -------------------------------------->
 int layoutMirrored;
 };
 HbIconLoaderPrivate::HbIconLoaderPrivate() :
 storedTheme(HbTheme::instance()->name()),
-mirroredListCreated(false),
 sourceResolution(144), // This is about the resolution of a Nokia N95 8GB
 resolution(144),
 zoom(1.0),
 animationManager(HbIconAnimationManager::global()),
 animationLoading(false),
 return "BLOB";
 }
 return suffix;
 }
-QString HbIconLoaderPrivate::findIconHelper(const QString &iconName, bool mirrored, bool& mirroredIconFound, bool useThemeIndex)
+QString HbIconLoaderPrivate::findSharedResourceHelper(const QString &resourceName, bool mirrored, bool& mirroredIconFound, Hb::ResourceType itemType, bool useThemeIndex)
 {
 Q_UNUSED(useThemeIndex)
+Q_UNUSED(itemType)
 mirroredIconFound = false;
 QString iconPath;
-if (QDir::isRelativePath(iconName)) {
+if (QDir::isRelativePath(resourceName)) {
-bool themeIndexUsed = false;
 #ifdef Q_OS_SYMBIAN
 // Try to get themed icon information from theme index
-ThemeIndexTables &themeIndex = hbInstance->theme()->d_ptr->themeIndex;
+HbThemeIndexResource resource(resourceName);
-// Check if there is a valid theme index
+if (resource.isValid()) {
-if (useThemeIndex && themeIndex.isValid()) {
+if (mirrored) {
-themeIndexUsed = true;
+return resource.fullMirroredFileName();
+} else {
-int tableIndex;
+return resource.fullFileName();
-const HbThemeIndexItem *item = themeIndex.getItem(iconName, tableIndex);
-if (item) {
-const char *baseAddress = reinterpret_cast<const char *>(themeIndex.tables[tableIndex]);
-QString fullfilename;
-// Add drive letter of the used theme if the path does not point to a QT resource
-if (*(baseAddress + item->folderOffset) != ':') {
-fullfilename.append(themeIndex.drives[tableIndex]);
-fullfilename.append(':');
-}
-// Add folder
-fullfilename.append(baseAddress + item->folderOffset);
-if (mirrored) {
-if (item->mirroredExtOffset >= 0) {
-mirroredIconFound = true;
-fullfilename.append("mirrored\\");
-fullfilename.append(iconName);
-fullfilename.append(baseAddress + item->mirroredExtOffset);
-#ifdef THEME_INDEX_TRACES
-qDebug() << "ThemeIndex: Resolved icon filename:" << fullfilename.toUtf8();
-#endif
-return fullfilename;
-}
-}
-fullfilename.append(iconName);
-fullfilename.append(baseAddress + item->extOffset);
-#ifdef THEME_INDEX_TRACES
-qDebug() << "ThemeIndex: Resolved icon filename:" << fullfilename.toUtf8();
-#endif
-return fullfilename;
 }
 }
 #endif // Q_OS_SYMBIAN
 // If there was no theme index, search the icon in theme icon dirs (slow)
-if (!themeIndexUsed) {
 foreach (const QString &dir, HbThemePrivate::instance()->iconDirectories()) {
 if (mirrored) {
 // If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
-iconPath =  HbStandardDirs::findResource( dir + "mirrored" + '/' + iconName, Hb::IconResource );
+iconPath =  HbStandardDirs::findResource( dir + "mirrored" + '/' + resourceName, Hb::IconResource );
 if( !iconPath.isEmpty() ) {
 mirroredIconFound = true;
-break;
-}
-}
-iconPath =  HbStandardDirs::findResource( dir + iconName, Hb::IconResource );
-// If the file was found in this dir, return the filename.
-if ( !iconPath.isEmpty() ) {
 break;
 }
 }
+iconPath =  HbStandardDirs::findResource( dir + resourceName, Hb::IconResource );
+// If the file was found in this dir, return the filename.
+if ( !iconPath.isEmpty() ) {
+break;
+}
 }
 } else {
 // Absolute path. Do not scan through different theme directories.
-QString iconNameCopy(iconName);
+QString iconNameCopy(resourceName);
 if (mirrored) {
 // If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
 // Find the directory part from the full filename
-int index1 = iconName.lastIndexOf('/');
+int index1 = resourceName.lastIndexOf('/');
-int index2 = iconName.lastIndexOf('\\');
+int index2 = resourceName.lastIndexOf('\\');
 int index = index1 > index2 ? index1 : index2;
-QString iconNameCopy(iconName);
+QString iconNameCopy(resourceName);
 if (index > 0) {
-iconNameCopy.insert(index+1, QString("mirrored\\"));
+iconNameCopy.insert(index+1, QString("mirrored/"));
 }
 iconPath = HbStandardDirs::findResource(iconNameCopy, Hb::IconResource);
 if( !iconPath.isEmpty() ) {
 mirroredIconFound = true;
 return iconPath;
 }
 }
-iconPath = HbStandardDirs::findResource(iconName, Hb::IconResource);
+iconPath = HbStandardDirs::findResource(resourceName, Hb::IconResource);
 }
 return iconPath;
 /*
 From Freedesktop.org:
 */
 }
 bool HbIconLoaderPrivate::isAutomaticallyMirrored(const QString &iconName)
 {
-if (!mirroredListCreated) {
+Q_UNUSED(iconName);
-// Read the list of the mirrored icons from a file.
+// only place to get mirroring information is from themeindex
-createMirroredList();
+#ifdef Q_OS_SYMBIAN
-mirroredListCreated = true;
+// Try to get themed icon information from theme index
-}
+HbThemeIndexResource resource(iconName);
+if (resource.isValid()) {
-// Check if the given icon name is found in the list of mirrored icons
+return resource.isAutomaticallyMirrored();
-QList<QString>::const_iterator j = qBinaryFind(mirroredList, iconName);
+}
-return (j != mirroredList.constEnd());
+#endif
+return false;
 }
 bool HbIconLoaderPrivate::isLayoutMirrored()
 {
 if (layoutMirrored == Unknown) {
 void HbIconLoaderPrivate::setLayoutMirrored(bool mirrored)
 {
 layoutMirrored = mirrored ? Mirrored : NotMirrored;
 }
-void HbIconLoaderPrivate::createMirroredList()
-{
-/* Todo: mirrored.txt will be refactored
-// Find mirrored.txt file
-QString filename = HbStandardDirs::findResource("themes/themes/mirrored.txt", Hb::ThemeResource);
-if (filename.endsWith("mirrored.txt")) {
-// Try to read file
-QFile file(filename);
-if (file.open(QIODevice::ReadOnly)) {
-QString line;
-while(!file.atEnd()) {
-QByteArray dirtyLine = file.readLine();
-line = QString(dirtyLine).trimmed();
-// Skip empty lines and comment lines
-if (line.isEmpty() || line.at(0) == '#') {
-continue;
-}
-mirroredList.append(line);
-}
-// Sort the list
-qSort(mirroredList.begin(), mirroredList.end());
-}
-}
-*/
-// button
-mirroredList << "qtg_fr_btn_normal" << "qtg_fr_btn_pressed" << "qtg_fr_btn_latched" << "qtg_fr_btn_highlight";
-mirroredList << "qtg_fr_btn_latched_highlight" << "qtg_fr_btn_disabled";
-// form
-mirroredList << "qtg_fr_form_value";
-// grid
-mirroredList << "qtg_fr_grid_normal" << "qtg_fr_grid_highlight" << "qtg_fr_grid_pressed";
-// list
-mirroredList << "qtg_fr_list_normal" << "qtg_fr_list_highlight" << "qtg_fr_list_pressed" << "qtg_fr_list_parent_normal";
-mirroredList << "qtg_fr_convlist_sent_normal" << "qtg_fr_convlist_sent_highlight" << "qtg_fr_convlist_sent_pressed";
-mirroredList << "qtg_fr_convlist_received_normal" << "qtg_fr_convlist_received_highlight" << "qtg_fr_convlist_received_pressed";
-// popup
-mirroredList << "qtg_fr_popup_list_normal" << "qtg_fr_popup_list_pressed" << "qtg_fr_popup_list_highlight" << "qtg_fr_popup_list_parent_normal";
-mirroredList << "qtg_fr_popup_grid_normal" << "qtg_fr_popup_grid_pressed" << "qtg_fr_popup_grid_highlight" << "qtg_graf_dimming_image";
-mirroredList << "qtg_fr_popup" << "qtg_fr_popup_secondary" << "qtg_fr_popup_preview";
-// progressive slider
-mirroredList << "qtg_fr_progslider_frame" << "qtg_fr_progslider_pressed" << "qtg_fr_progslider_loaded";
-mirroredList << "qtg_fr_progslider_played" << "qtg_graf_progslider_handle_normal" << "qtg_graf_progslider_handle_pressed";
-// slider
-mirroredList << "qtg_fr_slider_v_frame" << "qtg_fr_slider_v_filled" << "qtg_graf_slider_v_handle_normal" << "qtg_graf_slider_v_tick_minor";
-mirroredList << "qtg_graf_slider_v_tick_major" << "qtg_fr_slider_h_frame" << "qtg_fr_slider_h_filled" << "qtg_graf_slider_h_handle_normal";
-mirroredList << "qtg_graf_slider_h_tick_minor" << "qtg_graf_slider_h_tick_major";
-// tabs
-mirroredList << "qtg_fr_tab_active" << "qtg_fr_tab_passive_normal" << "qtg_fr_tab_passive_pressed" << "qtg_fr_tab_mask";
-// toolbar
-mirroredList << "qtg_fr_tb_h_normal" << "qtg_fr_tb_h_pressed" << "qtg_fr_tb_h_latched" << "qtg_fr_tb_h_disabled";
-mirroredList << "qtg_fr_tb_v_normal" << "qtg_fr_tb_v_pressed" << "qtg_fr_tb_v_latched" << "qtg_fr_tb_v_disabled";
-// toolbar extension
-mirroredList << "qtg_fr_tb_ext";
-// scrollbar
-mirroredList << "qtg_fr_scroll_v_handle" << "qtg_fr_scroll_v_frame" << "qtg_fr_scroll_h_handle" << "qtg_fr_scroll_h_frame";
-// status pane
-mirroredList << "qtg_fr_status_normal" << "qtg_fr_status_pressed" << "qtg_fr_status_latched" << "qtg_indi_status_options";
-qSort(mirroredList.begin(), mirroredList.end());
-}
 #ifdef HB_ICONIMPL_CACHE
 QByteArray HbIconLoaderPrivate::createCacheKeyFrom(const QString &iconName, const QSizeF &size,
-Qt::AspectRatioMode aspectRatioMode, QIcon::Mode mode, bool mirrored, const QColor &color)
+Qt::AspectRatioMode aspectRatioMode, QIcon::Mode mode, bool mirrored, const QColor &color,
-{
+HbRenderingMode renderMode)
-static const int paramArraySize = 7;
+{
+static const int paramArraySize = 8;
 // This uses QByteArray to improve performance compared to QString.
 // It allows appending stuff with less heap allocations and conversions compared to using QString.
 QByteArray cacheKey;
 int nameSize = iconName.size();
 } else {
 temp[5] = 0; // flag, color is invalid
 temp[6] = 0;
 }
+// Append render mode when creating cache key
+temp[7] = renderMode;
 cacheKey.append((char*)&(temp[0]), sizeof(int)*paramArraySize);
 const QChar *iconNamePtr = iconName.constData();
 cacheKey.append((char*)iconNamePtr, nameSize * sizeof(QChar));
 : QObject( parent )
 {
 setObjectName( appName );
 d = new HbIconLoaderPrivate();
+// Set default rendering mode to EHWRendering
+renderMode = EHWRendering;
 // Delete the icon loader when the application is destroyed.
 connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(destroy()));
 connect(HbLayoutDirectionNotifier::instance(), SIGNAL(layoutDirectionChangeStarted()),
 this, SLOT(updateLayoutDirection()));
+#ifdef HB_TOOL_INTERFACE
+// This enables partial theme updates.
+connect(&hbInstance->theme()->d_ptr->iconTheme, SIGNAL(iconsUpdated(QStringList)), this, SLOT(themeChange(QStringList)));
+#endif
 }
 HbIconLoader::~HbIconLoader()
 {
 delete d;
 // Step 2: There was no animation definition, try to get default size from theme index if it is a themed icon
 // TODO: change this to simpler function call in Symbian OS env
 if (QDir::isRelativePath(iconName)) {
 #ifdef Q_OS_SYMBIAN
+// Try to get themed icon information from theme index
-// Try to get themed icon default size from theme index
+HbThemeIndexResource resource(iconName);
-ThemeIndexTables &themeIndex = hbInstance->theme()->d_ptr->themeIndex;
+if (resource.isValid()) {
-// Check if there is a valid theme index
+// Try to get themed icon default size from theme index
-if (themeIndex.isValid()) {
+if (params.mirrored && resource.mirroredItemSize().isValid()) {
-int tableIndex;
+size = resource.mirroredItemSize();
-const HbThemeIndexItem *item = themeIndex.getItem(iconName, tableIndex);
+} else {
-if (item) {
+size = resource.defaultItemSize();
-if (params.mirrored && item->mirroredDefaultSize.isValid()) {
-size = item->mirroredDefaultSize;
-} else {
-size = item->defaultSize;
-}
 }
 // Returns invalid size if there is a valid theme index, but the item was not found there.
 return size;
 } else {
-		// Step 3: Theme index was not used, try to get icon's default size from theme server's default size cache.
+// Step 3: Theme index was not used, try to get icon's default size from theme server's default size cache.
 params.iconFileName = resolveIconFileName(params);
-		}
+}
 #else
 params.iconFileName = resolveIconFileName(params);
 #endif
 } else { // Absolute path, use it directly without resolving anything.
 params.iconFileName = iconName;
 }
 // If icon filename could not be resolved, return
 bool found = true;
 foreach (const QString &suffix, suffixList) {
 bool dummy = false;
-QString path = HbIconLoaderPrivate::findIconHelper(name + suffix, false, dummy);
+QString path = HbIconLoaderPrivate::findSharedResourceHelper(name + suffix, false, dummy);
 if (path.isEmpty()) {
 found = false;
 break;
 }
 }
 }
 void HbIconLoader::applyResolutionCorrection(QSizeF &size)
 {
 size = size * (qreal)(d->resolution) / (qreal)(d->sourceResolution) * d->zoom;
+}
+void HbIconLoader::themeChange(const QStringList &updatedFiles)
+{
+foreach (HbFrameDrawerPrivate *frameDrawer, this->frameDrawerInstanceList) frameDrawer->themeChange(updatedFiles);
 }
 void HbIconLoader::destroy()
 {
 if (theLoader) {
 }
 /*!
 \internal
-This is a wrapper for findIconHelper() (when the resource type is
+This is a wrapper for findSharedResourceHelper(). It is used for getting
-Hb::EffectIcon). It is used for getting AXML and other content from the
+resources from the themeserver.
-themeserver.
-If \a resType is Hb::EffectResource then the file is searched among the
-effects in the theme.
 The return value is either same as \a name, when the file is not found in the
 theme, or the full path and name to the file found in the theme. In certain
 situations the return value can also be an empty string, therefore it should
 not be trusted and used without any further examination.
 */
 QString HbIconLoader::findSharedResource(const QString &name, Hb::ResourceType resType)
 {
 bool temp;
-if (resType == Hb::EffectResource) {
+return HbIconLoaderPrivate::findSharedResourceHelper(name, false, temp, resType);
-QMap<int, QString> effectHier = HbThemeUtils::constructHierarchyListWithPathInfo(
-name, HbTheme::instance()->name(), Hb::EffectResource);
-HbStandardDirs::findResourceList(effectHier, Hb::EffectResource);
-// Just take the first value from the map. (note that maps are sorted by the key)
-foreach (const QString &file, effectHier) {
-return file;
-}
-// The map was empty, return empty string.
-return QString();
-} else {
-// Assume icon case (png, svg, axml, etc.)
-// TODO: theme index does not support currently axmls, so setting 'useThemeIndex' parameter to false
-return HbIconLoaderPrivate::findIconHelper(name, false, temp, false);
-}
 }
 /*!
 This function is used to register the IconEngine instance to IconLoader
 */
 params.iconFileName = resolveIconFileName(params);
 QString format = formatFromPath(params.iconFileName);
 // Try to get the default size from server if the icon is not such that is loaded in client side.
 if (format != "MNG"
 && format != "GIF"
-&& !params.iconName.startsWith(':')) {
+&& !params.iconFileName.startsWith(':'))
+{
 QSizeF defSize = HbThemeClient::global()->getSharedIconDefaultSize(params.iconFileName);
 if (defSize.isValid()) {
 return defSize;
 }
 }
 }
 QString HbIconLoader::resolveIconFileName(HbIconLoadingParams &params)
 {
 // Search in theme (assume that we received a logical icon name).
-QString iconPath = d->findIconHelper(params.cleanIconName, params.mirrored, params.mirroredIconFound);
+QString iconPath = d->findSharedResourceHelper(params.cleanIconName, params.mirrored, params.mirroredIconFound);
 bool iconFound = !iconPath.isEmpty();
 #ifdef HB_ICON_TRACES
 qDebug() << params.cleanIconName << " => " << iconPath;
 #endif
 // If not found then it can still be a normal file specified with a relative path.
 }
 }
 // Use the 'unknown' icon, if needed, when the queried icon was not found.
 if (!iconFound) {
 if (params.options.testFlag(ReturnUnknownIcon)) {
-iconPath = d->findIconHelper(s_unknown, false, params.mirroredIconFound);
+iconPath = d->findSharedResourceHelper(s_unknown, false, params.mirroredIconFound);
 }
 }
 return iconPath;
 }
 params.size,
 params.aspectRatioMode,
 params.mode,
 (params.mirrored && !params.mirroredIconFound),
 params.options,
-params.color);
+params.color,
+params.renderMode);
 //Creates HbIconImpl instance based on the type of data returned by themeserver.
 //HbIconImpl thus created could be any one of the following impl-types:
 //1. HbSgImageIconImpl
 //2. HbNvgIconImpl
 #endif
 }
 // Delete original pixmap if its size is large
 source->deletePixmapIfLargerThan(PIXMAP_SIZE_LIMIT);
+}
+/*!
+* \fn void HbIconLoader::switchRenderingMode()
+*
+* This function gets notified when the rendering mode of the application changes e.g
+* ( Hardware - Software rendering or vice versa ). If the mode is changed from
+*  Hardware to Software, all Hardware rendered icons will release the GPU resources.
+*  This function also initiates an IPC call to ThemeServer, so that the server
+*  can do its part of cleanup.
+*  \a newRenderMode new rendering mode of application
+*/
+void HbIconLoader::switchRenderingMode(HbRenderingMode newRenderMode)
+{
+#ifndef Q_OS_SYMBIAN
+Q_UNUSED(newRenderMode)
+#endif
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+if (newRenderMode != renderMode) {
+if (newRenderMode == ESWRendering) {
+// switching from HW to SW mode
+freeGpuIconData();
+}
+if (HbThemeClient::global()->switchRenderingMode(newRenderMode)) {
+renderMode = newRenderMode;
+}
+}
+#endif
+}
+void HbIconLoader::updateRenderingMode(QPaintEngine::Type type)
+{
+if (type == QPaintEngine::OpenVG) {
+renderMode = EHWRendering;
+} else {
+renderMode = ESWRendering;
+}
 }
 /*!
 * \fn HbIconImpl* HbIconLoader::loadIcon()
 *
 params.mirroredIconFound = false;
 params.canCache = true;
 params.animationCreated = false;
 params.mirroringHandled = false;
 params.modeHandled = false;
+params.renderMode = renderMode;
 resolveCleanIconName(params);
 // Step 1: Check if the icon has animation definition
 // This check is to prevent animation frames from trying to load new animations
 // Step 2: There was no animation definition, try get icon from server
 if (!params.animationCreated) {
 #ifdef HB_ICONIMPL_CACHE
 QByteArray cacheKey = d->createCacheKeyFrom( params.iconName, params.size, params.aspectRatioMode,
-params.mode, params.mirrored, params.color );
+params.mode, params.mirrored, params.color, params.renderMode );
 //look up in the local iconImplCache.
 //If found return the ptr directly
 if (iconImplCache.contains(cacheKey)) {
 HbIconImpl * ptr = iconImplCache.value(cacheKey);
 ptr->incrementRefCount();
 // Consolidated icon will be created for NVG with SGImage lite support.
 // and when NVG is not available.
 #if defined(HB_ICONIMPL_CACHE)
 QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId, size,
-aspectRatioMode, mode, mirrored, color);
+aspectRatioMode, mode, mirrored, color, renderMode);
 //If consolidated icon found in the client's cache, increment ref-count and return
 if (iconImplCache.contains(cacheKey)) {
 HbIconImpl * ptr = iconImplCache.value(cacheKey);
 ptr->incrementRefCount();
 #ifdef HB_ICON_CACHE_DEBUG
 #endif
 QStringList iconPathList;
 for (int i = 0; i < listOfIcons.count(); i++) {
-QString path = d->findIconHelper(listOfIcons.at(i), mirrored, mirroredIconFound);
+QString path = d->findSharedResourceHelper(listOfIcons.at(i), mirrored, mirroredIconFound);
 if (!path.isEmpty()) {
 iconPathList.append(path);
 } else {
 return icon;
 }
 //If consolidated icon was not found in the client's cache, initiate an IPC to load
 //the consolidated icon on themeserver
 iconInfo = HbThemeClient::global()->getMultiPartIconInfo(iconPathList,
 multiPartIconData, size, aspectRatioMode, mode,
-(mirrored && !mirroredIconFound), options, color);
+(mirrored && !mirroredIconFound), options, color, renderMode);
 #ifdef HB_ICON_TRACES
 qDebug() << "HbIconLoader::getMultiPartIconInfo, offset from server: " << iconInfo.pixmapData.offset << iconPathList;
 #endif
 mirroredIconFound,
 options,
 color,
 HbIconLoader::AnyType,
 HbIconLoader::AnyPurpose,
-multiPieceImpls);
+multiPieceImpls,
+renderMode);
 #else
 //For OS other than Symbian, call HbIconLoader::loadIcon to individually load icons
 for (int i = 0; i < count; i++) {
 HbIconImpl *impl = loadIcon(iconPathList[i], HbIconLoader::AnyType,
 HbIconLoader::AnyPurpose,
 HbThemeClient::global()->unloadIcon(icon->iconFileName(),
 icon->keySize(),
 icon->iconAspectRatioMode(),
 icon->iconMode(),
 icon->isMirrored(),
-icon->color()
+icon->color(),
-);
+icon->iconRenderingMode()
+);
 }
 #ifdef HB_ICONIMPL_CACHE
 int rem = iconImplCache.remove(iconImplCache.key(icon));
 if (rem > 0) {
 #ifdef HB_ICON_TRACES
 bool mirroredIconFound,
 HbIconLoader::IconLoaderOptions options,
 const QColor &color,
 HbIconLoader::IconDataType type,
 HbIconLoader::Purpose,
-QVector<HbIconImpl *> & iconImplList)
+QVector<HbIconImpl *> & iconImplList,
-{
+HbRenderingMode currRenderMode)
-	 Q_UNUSED(type);
+{
-	 QVector<int> posList;
+Q_UNUSED(type);
+QVector<int> posList;
 #ifdef HB_ICONIMPL_CACHE
 // search the client cache first before asking the server
 for(int i = 0; i < multiPartIconList.count(); i++) {
 QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i], sizeList[i], aspectRatioMode,
-mode, mirrored, color );
+mode, mirrored, color, currRenderMode );
 //look up in the local iconImplCache.
 //If found return the ptr directly
 HbIconImpl * ptr = 0;
 if (iconImplCache.contains(cacheKey)) {
 ptr = iconImplCache.value(cacheKey);
 #endif
 // If client-side cache is not enabled, ask server for all the pieces' information
 int count = multiPartIconList.count();
 if (count > 0) {
 HbSharedIconInfoList iconInfoList = HbThemeClient::global()->getMultiIconInfo(multiPartIconList, sizeList,
-aspectRatioMode, mode, mirrored, options, color);
+aspectRatioMode, mode, mirrored, options, color, currRenderMode);
 HbIconImpl* impl = 0;
 HbIconLoadingParams params;
 impl = HbIconImplCreator::createIconImpl(iconInfoList.icon[i], params);
 #ifdef HB_ICONIMPL_CACHE
 QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconList[i], sizeList.at(i) , aspectRatioMode,
-mode, mirrored, color);
+mode, mirrored, color, currRenderMode);
 iconImplCache.insert(cacheKey, impl);
 #ifdef HB_ICON_CACHE_DEBUG
 qDebug() << "HbIconLoader::getMultiIconImplFromServer(): " << params.iconName << " inserted into impl-cache, ref-count now = " << impl->refCount();
 #endif
 HbThemeClient::global()->unLoadMultiIcon(iconNameList,
 sizeList,
 multiPieceImpls[0]->iconAspectRatioMode(),
 multiPieceImpls[0]->iconMode(),
 multiPieceImpls[0]->isMirrored(),
-multiPieceImpls[0]->color()
+multiPieceImpls[0]->color(),
+multiPieceImpls[0]->iconRenderingMode()
 );
 }
 }
 // End of File

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 5	627c4a0fd0e7