FCL/sf/mw/hb: comparison src/hbcore/primitives/hbiconitem.cpp

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 #include "hbiconitem.h"
 #include "hbiconitem_p.h"
 #include "hbiconanimator.h"
 #include "hbicon_p.h"
 #include "hboogmwatcher_p.h"
+#include "hbinstance_p.h"
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 /*!
 mAnimator(),
 mAlignment(HbIconItem::defaultAlignment),
 mAspectRatioMode(HbIconItem::defaultAspectRatioMode),
 mState(HbIconItem::defaultState),
 mMode(HbIconItem::defaultMode),
-mClearCachedRect(true)
+mClearCachedRect(true),
+mIconScalingEnabled(true)
 {
 q_ptr = 0;
 }
 HbIconItemPrivate::~HbIconItemPrivate()
 HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor);
 }
 const QRectF boundingRect = q->rect();
 if (!boundingRect.size().isEmpty()) {
 mIconRect = boundingRect;
-mIcon.setSize(mIconRect.size());
+mIcon.setSize(mIconScalingEnabled ? mIconRect.size() : mIcon.defaultSize());
 mAnimator.setIcon(mIcon);
 q->update();
 }
 }
 void HbIconItemPrivate::recalculateBoundingRect() const
 {
 Q_Q(const HbIconItem);
 mBoundingRect = q->HbWidgetBase::boundingRect();
-//workaround for qt bug http://bugreports.qt.nokia.com/browse/QTBUG-8820
-mAdjustedRect.setWidth(qMax(qreal(0),mBoundingRect.width() - qreal(2.0)));
-mAdjustedRect.setHeight(qMax(qreal(0),mBoundingRect.height() - qreal(2.0)));
-//workaround ends
 mClearCachedRect = false;
 }
 void HbIconItemPrivate::setThemedColor(const QColor &color)
 {
 }
 /*!
 Sets the alignment for the icon.
-If this method is not called, the icon uses its default alignment.
+By default no aligning is used.
-The default alignment can be defined in the icon definition file, otherwise it defaults to Qt::AlignCenter.
-\param alignment the new icon alignment.gnCenter.
+\param alignment the new icon alignment
 \sa alignment
 */
 void HbIconItem::setAlignment(Qt::Alignment alignment)
 {
 }
 /*!
 Sets the aspect ratio mode for the icon.
-If this method is not called, the icon uses its default aspect ratio mode.
+It defaults to Qt::KeepAspectRatio.
-The default mode can be defined in the icon definition file, otherwise it defaults to Qt::KeepAspectRatio.
 \param aspectRatio the new icon aspect ratio.
 \sa aspectRatioMode
 */
 void HbIconItem::setAspectRatioMode(Qt::AspectRatioMode aspectRatioMode)
 d->mBrush = brush;
 update();
 }
 }
+/*!
+Enables or disables icon scaling.
+By default the setting is true, i.e. scaling is enabled.
+When enabled, the size of the icon will be set to match
+the item's size, so scaling may occur (by taking the aspect
+ratio setting into account).
+Scaling should only be disabled when the icon item is used
+with raster graphics, for which upscaling is not desired.
+When disabled, the size of the icon will be the default size
+of its source, i.e. in case of raster graphics the original dimensions
+of the image. It is recommended to set the center alignment too in this case.
+The size of the icon item is not affected, the content will just not cover the
+entire area. Note however that when the icon's default size is bigger than the
+size of the item displaying it then downscaling will still occur.
+\sa iconScaling
+*/
+void HbIconItem::setIconScaling(bool enabled)
+{
+Q_D(HbIconItem);
+if (d->mIconScalingEnabled != enabled) {
+d->mIconScalingEnabled = enabled;
+d->updateIconItem();
+}
+}
 /*!
 Sets the new icon name for this HbIconItem for \a mode and \a state. If iconName is already set in
 HbIconItem then it will be replaced with this new iconName.
 \param  iconName the icon name.
 \param  mode  mode of the  icon.
 \param  state state of the icon.
 \sa HbIcon::setIconName()
 \sa iconName
 */
 void HbIconItem::setIconName(const QString &iconName, QIcon::Mode mode, QIcon::State state)
 {
 {
 Q_D(const HbIconItem);
 return d->mBrush;
 }
+/*!
+\return the current setting for icon scaling. By default it is true (i.e. enabled).
+\sa setIconScaling
+*/
+bool HbIconItem::iconScaling() const
+{
+Q_D(const HbIconItem);
+return d->mIconScalingEnabled;
+}
 /*!
 * Refer HbIcon::isNull()
 */
 bool HbIconItem::isNull() const
 {
 if (d->mIconRect != d->mBoundingRect) {
 d->mIconRect = d->mBoundingRect;
 if (!d->mIcon.isNull()) {
 HbIconPrivate::d_ptr_detached(&d->mIcon)->setThemedColor(d->mThemedColor);
 }
-d->mIcon.setSize(d->mIconRect.size());
+d->mIcon.setSize(d->mIconScalingEnabled ? d->mIconRect.size() : d->mIcon.defaultSize());
 d->mAnimator.setIcon(d->mIcon);
 }
 if (d->mBrush != Qt::NoBrush) {
 painter->fillRect(d->mBoundingRect, d->mBrush);
 }
 {
 Q_D(const HbIconItem);
 if (d->mClearCachedRect) {
 d->recalculateBoundingRect();
 }
-return d->mAdjustedRect;
+return d->mBoundingRect;
 }
 /*!
 \reimp
 */
 \reimp
 */
 QVariant HbIconItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
 Q_D(HbIconItem);
-if (QGraphicsItem::ItemEnabledHasChanged == change) {
+if (change == QGraphicsItem::ItemEnabledHasChanged) {
 d->mMode = value.toBool() ? QIcon::Normal : QIcon::Disabled;
+} else if (change == QGraphicsItem::ItemVisibleHasChanged) {
+if (!value.toBool() && HbInstancePrivate::d_ptr()->mDropHiddenIconData) {
+d->clearStoredIconContent();
+}
 }
 return HbWidgetBase::itemChange(change, value);
 }

changeset 21	4633027730f5
parent 7	923ff622b8b9
child 23	e6ad4ef83b23