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

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 /*!
 @stable
 @hbcore
 \class HbIconItem
-\brief HbIconItem displays an HbIcon instance.
+\brief HbIconItem displays an icon provided in form of an HbIcon
 HbIconItem derives from HbWidgetBase and so can be added to a layout.
 Use HbIconItem when you need your icon's position and size to be managed by a layout.
 //Create new icon, set position and size for it
 HbIconItem *icon = new HbIconItem("qtg_large_phonebook", this);
 icon->setPos(10,150);
 icon->setSize(icon->defaultSize());
 \endcode
 Example of how to add HbIconItem to a layout.
 \code
 HbButton *button = new HbButton("Button 1");
 HbIconItem *icon = new HbIconItem("qtg_large_phonebook");
 QGraphicsGridLayout *layout = new QGraphicsGridLayout();
 //Initialize the default values
 const QIcon::Mode HbIconItem::defaultMode = QIcon::Normal;
 const QIcon::State HbIconItem::defaultState = QIcon::Off;
 const Qt::AspectRatioMode HbIconItem::defaultAspectRatioMode = Qt::KeepAspectRatio;
-const Qt::Alignment HbIconItem::defaultAlignment = Qt::AlignCenter;
+// Note: No center aligning by default to prevent interesting rounding issues
+// in certain cases (e.g. 50.25x50.25 sized icon item would lead to having an
+// icon sized 50x50 drawn at (0.12499, 0.12499) which may or may not fit visually
+// the other primitives of the same widget).
+const Qt::Alignment HbIconItem::defaultAlignment = 0;
 bool HbIconItemPrivate::outlinesEnabled = false;
 HbIconItemPrivate::HbIconItemPrivate(const HbIcon &icon) :
 mIcon(icon),
 mAnimator(),
 mAlignment(HbIconItem::defaultAlignment),
 mAspectRatioMode(HbIconItem::defaultAspectRatioMode),
 mState(HbIconItem::defaultState),
-mMode(HbIconItem::defaultMode)
+mMode(HbIconItem::defaultMode),
+mClearCachedRect(true)
 {
 q_ptr = 0;
 }
-HbIconItemPrivate::~HbIconItemPrivate ()
+HbIconItemPrivate::~HbIconItemPrivate()
 {
 }
 void HbIconItemPrivate::updateIconItem()
 {
-Q_Q( HbIconItem );
+Q_Q(HbIconItem);
+if (!mIcon.isNull()) {
+// This must be done before the setIcon() call below due to the
+// possibility of detaching. Doing it afterwards would lead to
+// colorization errors as the themed color might potentially be set for
+// a different icon engine, not for the one that is used in painting.
+HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor);
+}
 const QRectF boundingRect = q->rect();
 if (!boundingRect.size().isEmpty()) {
 mIconRect = boundingRect;
 mIcon.setSize(mIconRect.size());
 mAnimator.setIcon(mIcon);
 q->update();
 }
 }
+void HbIconItemPrivate::updateIconParams()
+{
+Q_Q(HbIconItem);
+if (mIconRect.isValid()) {
+if (!mIcon.isNull()) {
+HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor);
+}
+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)
+{
+mThemedColor = color;
+updateIconItem();
+}
 /*!
 Constructs a new HbIconItem with \a iconName and \a parent.
 \param iconName the name of the icon.
 See HbIcon for a description of how the icon name and the icon image filename are related.
 \param parent the graphics item parent of this icon.
 */
 HbIconItem::HbIconItem(const QString &iconName, QGraphicsItem *parent) :
 HbWidgetBase(*new HbIconItemPrivate(iconName), parent)
 {
-Q_D( HbIconItem );
+Q_D(HbIconItem);
 d->q_ptr = this;
 // Set this graphics item to be updated on icon animations
 d->mAnimator.setGraphicsItem(this);
 HbOogmWatcher::instance()->registerIconItem(this);
 }
 \param parent the graphics item parent of this icon.
 */
 HbIconItem::HbIconItem(const HbIcon &icon, QGraphicsItem *parent) :
 HbWidgetBase(*new HbIconItemPrivate(icon), parent)
 {
-Q_D( HbIconItem );
+Q_D(HbIconItem);
 d->q_ptr = this;
 // Set this graphics item to be updated on icon animations
 d->mAnimator.setGraphicsItem(this);
 HbOogmWatcher::instance()->registerIconItem(this);
 }
 \param parent the graphics item parent of this HbIconItem.
 */
 HbIconItem::HbIconItem(QGraphicsItem *parent) :
 HbWidgetBase(*new HbIconItemPrivate(QString()), parent)
 {
-Q_D( HbIconItem );
+Q_D(HbIconItem);
 d->q_ptr = this;
 // Set this graphics item to be updated on icon animations
 d->mAnimator.setGraphicsItem(this);
 HbOogmWatcher::instance()->registerIconItem(this);
 }
 /*!
 \internal
 */
-HbIconItem::HbIconItem(HbIconItemPrivate &dd, QGraphicsItem * parent) :
+HbIconItem::HbIconItem(HbIconItemPrivate &dd, QGraphicsItem *parent) :
 HbWidgetBase(dd, parent)
 {
 // Set this graphics item to be updated on icon animations
 dd.mAnimator.setGraphicsItem(this);
 HbOogmWatcher::instance()->registerIconItem(this);
 /*!
 Destructor.
 */
 HbIconItem::~HbIconItem()
 {
-HbOogmWatcher::instance()->unregisterIconItem(this);
+HbOogmWatcher *w = HbOogmWatcher::instance();
+if (w) {
+w->unregisterIconItem(this);
+}
 }
 /*!
 \return the HbIcon associated with this HbIconItem instance.
 \sa setIcon
 */
 HbIcon HbIconItem::icon() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mIcon;
 }
 /*!
 Sets the HbIcon instance associated with this HbIconItem.
+Calling any function on \a icon after this one may not have any effect on the
+icon displayed by the HbIconItem. Use the setters in HbIconItem instead. Of course
+the settings set on \a icon before calling setIcon() will all be taken into account.
+The icon-specific parameters (flags, color, mirroring mode) set via the HbIconItem
+setters before are lost as this function causes the entire underlying icon to be
+replaced with a new one.
 \param icon the HbIcon instance that this HbIconItem displays.
-When \a takeIconSettings is false, the following settings are not
+\sa icon()
-taken (ignored) from \a icon: flags, color, mirroring mode.  Instead,
+*/
-the previous values set via HbIconItem's setters are used.
+void HbIconItem::setIcon(const HbIcon &icon, bool reserved)
+{
-\sa icon
+Q_UNUSED(reserved);
-*/
+Q_D(HbIconItem);
-void HbIconItem::setIcon(const HbIcon &icon, bool takeIconSettings)
-{
-Q_D(HbIconItem );
 if (d->mIcon != icon) {
-if (takeIconSettings) {
+d->mIcon = icon;
-d->mIcon = icon;
-} else {
-// Must preserve settings like flags, colors, etc. In this case the
-// settings made previously through HbIconItem take precedence over the
-// newly set HbIcon's own settings.
-HbIcon::Flags prevFlags = d->mIcon.flags();
-QColor prevColor = d->mIcon.color();
-HbIcon::MirroringMode prevMirroringMode = d->mIcon.mirroringMode();
-d->mIcon = icon;
-d->mIcon.setFlags(prevFlags);
-d->mIcon.setColor(prevColor);
-d->mIcon.setMirroringMode(prevMirroringMode);
-}
 d->updateIconItem();
 }
 }
 /*!
 \sa alignment
 */
 void HbIconItem::setAlignment(Qt::Alignment alignment)
 {
-Q_D(HbIconItem );
+Q_D(HbIconItem);
+d->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAlign, true);
 if (d->mAlignment != alignment) {
 d->mAlignment = alignment;
 update();
 }
 }
 \sa aspectRatioMode
 */
 void HbIconItem::setAspectRatioMode(Qt::AspectRatioMode aspectRatioMode)
 {
-Q_D(HbIconItem );
+Q_D(HbIconItem);
 d->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode, true);
 if (d->mAspectRatioMode != aspectRatioMode) {
 d->mAspectRatioMode = aspectRatioMode;
 update();
 }
 /*!
 Sets the QIcon mode for the icon. An icon can show different images for different modes.
 If this method is not called, the icon uses the default mode which is QIcon::Normal.
 \param mode the new icon mode.
 \warning Currently this method makes use of pixmap() routine in case of NVG icons.
 pixmap() slows down the hardware accelerated rendering.
 \sa mode
 */
 void HbIconItem::setMode(QIcon::Mode mode)
 {
-Q_D(HbIconItem );
+Q_D(HbIconItem);
 if (d->mMode != mode) {
 d->mMode = mode;
 update();
 }
 }
 \sa state
 */
 void HbIconItem::setState(QIcon::State state)
 {
-Q_D(HbIconItem );
+Q_D(HbIconItem);
 if (d->mState != state) {
 d->mState = state;
 update();
 }
 }
 \sa HbIcon::setIconName()
 \sa iconName
 */
 void HbIconItem::setIconName(const QString &iconName)
 {
-Q_D(HbIconItem );
+Q_D(HbIconItem);
 if (d->mIcon.iconName() != iconName) {
 d->mIcon.setIconName(iconName);
 d->updateIconItem();
 }
 }
 void HbIconItem::setFlags(HbIcon::Flags flags)
 {
 Q_D(HbIconItem);
 if (d->mIcon.flags() != flags) {
 d->mIcon.setFlags(flags);
-if (d->mIconRect.isValid())
+d->updateIconParams();
-d->mAnimator.setIcon(d->mIcon);
-update();
 }
 }
 /*!
 Sets the mirroring \a mode for the icon item.
 void HbIconItem::setMirroringMode(HbIcon::MirroringMode mode)
 {
 Q_D(HbIconItem);
 if (d->mIcon.mirroringMode() != mode) {
 d->mIcon.setMirroringMode(mode);
-if (d->mIconRect.isValid())
+d->updateIconParams();
-d->mAnimator.setIcon(d->mIcon);
-update();
 }
 }
 /*!
 Sets the \a brush for the icon item.
 \sa HbIcon::setIconName()
 \sa iconName
 */
 void HbIconItem::setIconName(const QString &iconName, QIcon::Mode mode, QIcon::State state)
 {
-Q_D( HbIconItem );
+Q_D(HbIconItem);
 d->mIcon.setIconName(iconName, mode, state);
 d->updateIconItem();
 }
 /*!
-Sets the new icon color for the HbIconItem. Note that the color is just
+Sets the new icon color for the HbIconItem. Note that the color
-stored but not actually used if the HbIcon::Colorized flag is not set and the
+is just stored but not actually used if the HbIcon::Colorized flag
-icon is not a mono icon from the theme.
+is not set and the icon is not a mono icon from the theme.
-\param  color to be set.
+See HbIcon::setColor() for more information on colorization of mono
-\sa HbIconItem::color(), HbIcon::setColor()
+icons in widgets.
+\param  color to be set.
+\sa HbIconItem::color(), HbIcon::setColor()
 */
 void HbIconItem::setColor(const QColor &color)
 {
-Q_D( HbIconItem );
+Q_D(HbIconItem);
 if (d->mIcon.color() != color) {
 d->mIcon.setColor(color);
-if (d->mIconRect.isValid())
+d->updateIconParams();
-d->mAnimator.setIcon(d->mIcon);
-update();
 }
 }
 /*!
 * Returns the color of the HbIconItem.
 * \sa HbIconItem::setColor()
 */
 QColor HbIconItem::color() const
 {
-Q_D(const  HbIconItem );
+Q_D(const  HbIconItem);
 return d->mIcon.color();
 }
 /*!
 Returns the default size of the icon.
 For raster images this is the original size of the image.
 \sa HbIcon::defaultSize()
 */
 QSizeF HbIconItem::defaultSize() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mIcon.defaultSize();
 }
 /*!
 \return the size of this HbIconItem
 \sa setAspectRatioMode
 */
 Qt::AspectRatioMode HbIconItem::aspectRatioMode() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mAspectRatioMode;
 }
 /*!
 \return the icon's alignment.
 \sa setAlignment
 */
 Qt::Alignment HbIconItem::alignment() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mAlignment;
 }
 /*!
 \return the icon's mode.
 \sa setMode
 */
 QIcon::Mode HbIconItem::mode() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mMode;
 }
 /*!
 \return the icon's state.
 \sa setState
 */
 QIcon::State HbIconItem::state() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mState;
 }
 /*!
 \return the icon's name.
 \sa HbIcon::iconName()
 \sa setIconName
 */
 QString HbIconItem::iconName() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mIcon.iconName();
 }
 /*!
 \return the icon name for a specific mode and state.
 \sa HbIcon::iconName()
 \sa setIconName
 */
 QString HbIconItem::iconName(QIcon::Mode mode, QIcon::State state) const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mIcon.iconName(mode, state);
 }
 /*!
 \return the HbIcon flags for the icon displayed by this HbIconItem.
 /*!
 * Refer HbIcon::isNull()
 */
 bool HbIconItem::isNull() const
 {
-Q_D(const HbIconItem );
+Q_D(const HbIconItem);
 return d->mIcon.isNull();
 }
 /*!
 Paints the graphics item.
 void HbIconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
 Q_UNUSED(widget)
 Q_UNUSED(option)
 Q_D(HbIconItem);
-const QRectF rect(boundingRect());
+if (d->mClearCachedRect){
-if(!rect.isEmpty()){
+d->recalculateBoundingRect();
-if (d->mIconRect != rect) {
+}
-d->mIconRect = rect;
+if (!d->mBoundingRect.isEmpty()){
+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->mAnimator.setIcon(d->mIcon);
 }
-painter->fillRect(rect, d->mBrush);
+if (d->mBrush != Qt::NoBrush) {
-d->mAnimator.paint(painter, rect,
+painter->fillRect(d->mBoundingRect, d->mBrush);
+}
+d->mAnimator.paint(painter, d->mBoundingRect,
 d->mAspectRatioMode, d->mAlignment,
 d->mMode, d->mState);
 }
 if (HbIconItemPrivate::outlinesEnabled) {
 painter->setBrush(QBrush(QColor(0, 255, 0, 50)));
 painter->drawRect(contentsRect());
 }
+}
+/*!
+\reimp
+*/
+QRectF HbIconItem::boundingRect() const
+{
+Q_D(const HbIconItem);
+if (d->mClearCachedRect) {
+d->recalculateBoundingRect();
+}
+return d->mAdjustedRect;
+}
+/*!
+\reimp
+*/
+void HbIconItem::setGeometry(const QRectF& rect)
+{
+Q_D(HbIconItem);
+d->mClearCachedRect = true;
+HbWidgetBase::setGeometry(rect);
 }
 /*!
 \reimp
 */
 HbWidgetBase::changeEvent(event);
 break;
 }
 }
 /*!
 \reimp
 */
 QVariant HbIconItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
 Q_D(HbIconItem);
-if (QGraphicsItem::ItemEnabledHasChanged==change) {
+if (QGraphicsItem::ItemEnabledHasChanged == change) {
 d->mMode = value.toBool() ? QIcon::Normal : QIcon::Disabled;
 }
 return HbWidgetBase::itemChange(change, value);
 }

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 21	4633027730f5
child 34	ed14f46c0e55