equal
deleted
inserted
replaced
343 */ |
343 */ |
344 void HbIconItem::setAlignment(Qt::Alignment alignment) |
344 void HbIconItem::setAlignment(Qt::Alignment alignment) |
345 { |
345 { |
346 Q_D(HbIconItem); |
346 Q_D(HbIconItem); |
347 d->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAlign, true); |
347 d->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAlign, true); |
|
348 alignment = d->combineAlignment(alignment, d->mAlignment); |
348 if (d->mAlignment != alignment) { |
349 if (d->mAlignment != alignment) { |
349 d->mAlignment = alignment; |
350 d->mAlignment = alignment; |
350 update(); |
351 update(); |
351 } |
352 } |
352 } |
353 } |
736 { |
737 { |
737 Q_UNUSED(widget) |
738 Q_UNUSED(widget) |
738 Q_UNUSED(option) |
739 Q_UNUSED(option) |
739 Q_D(HbIconItem); |
740 Q_D(HbIconItem); |
740 |
741 |
741 if (d->mIcon.isNull()) { |
742 if (d->mIcon.isNull() && d->mBrush == Qt::NoBrush) { |
742 return; |
743 return; |
743 } |
744 } |
744 |
745 |
745 if (d->mClearCachedRect){ |
746 if (d->mClearCachedRect){ |
746 d->recalculateBoundingRect(); |
747 d->recalculateBoundingRect(); |