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

equal deleted inserted replaced

-:06ff229162e9
+:11d3954df52a
 const qreal KFadeTolerance = 1.0;
 HbTextItemPrivate::HbTextItemPrivate () :
 mAlignment(Qt::AlignLeft | Qt::AlignVCenter),
 mElideMode(Qt::ElideNone),
-mDontPrint(false),
-mDontClip(false),
 mInvalidateShownText(true),
 mOffsetPos(0,0),
 mPaintFaded(false),
 mFadeLengthX(30),
 mFadeLengthY(15),
 void HbTextItemPrivate::init(QGraphicsItem *)
 {
 Q_Q(HbTextItem);
 q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-q->setFlag(QGraphicsItem::ItemClipsToShape, !mDontClip);
+q->setFlag(QGraphicsItem::ItemClipsToShape, false);
 q->setFlag(QGraphicsItem::ItemIsSelectable, false);
 q->setFlag(QGraphicsItem::ItemIsFocusable,  false);
 QTextOption textOption = mTextLayout.textOption();
 textOption.setWrapMode(QTextOption::WordWrap);
 case QTextOption::WrapAtWordBoundaryOrAnywhere:
 flags |= Qt::TextWordWrap | Qt::TextWrapAnywhere;
 break;
 }
-if(mDontClip)  flags |= Qt::TextDontClip;
+if(q_ptr->flags().testFlag(QGraphicsItem::ItemClipsToShape)) {
-if(mDontPrint) flags |= Qt::TextDontPrint;
+flags |= Qt::TextDontClip;
+}
+if(!q_ptr->isVisible()) { // or ItemHasNoContents?
+flags |= Qt::TextDontPrint;
+}
 return flags;
 }
 bool HbTextItemPrivate::adjustSizeHint()
 Q_UNUSED(lineBegin)
 #endif // HB_FADE_EFFECT_WORKAROUND_ON_PHONE
 }
 /*
-This method paint each line in tree pieces.
+This method paints single piece of text layout.
-In each piece uses different pen.
+If line contains criticalX value then fadePen is used for painting in other
-When fade effect is not needed on some end centerPen is used.
+case normalPen is used.
 */
-int HbTextItemPrivate::paintFaded(QPainter *painter,
+void HbTextItemPrivate::paintArea(QPainter *painter,
 int firstItemToPaint,
-const QPen& leftPen,
+int lastItemToPaint,
-const QPen& centerPen,
+const QPen& normalPen,
-const QPen& rightPen,
+const QPen& fadePen,
-const QRectF& area ) const
+qreal criticalX) const
 {
-Q_Q(const HbTextItem);
+for(int i=firstItemToPaint; i<=lastItemToPaint; ++i) {
-const int n = mTextLayout.lineCount();
-const qreal leftBorder = q->contentsRect().left()-KFadeTolerance;
-const qreal rightBorder = q->contentsRect().right()+KFadeTolerance;
-QRectF leftRect(area);
-leftRect.setRight(mFadeFromRect.left());
-QRectF centerRect(area);
-centerRect.moveLeft(leftRect.right());
-centerRect.setRight(mFadeFromRect.right());
-QRectF rightRect(area);
-rightRect.setLeft(centerRect.right());
-qreal maxY = area.bottom();
-for(int i=firstItemToPaint; i<n; ++i) {
 QTextLine line = mTextLayout.lineAt(i);
 QRectF lineRect = line.naturalTextRect();
 lineRect.translate(mOffsetPos);
 #ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
-const QPointF gradientOffset(
+const QPointF gradientOffset(lineRect.left(),
-QPointF(lineRect.left(),
+lineRect.top()+line.ascent());
-lineRect.top()+line.ascent())
-);
+if (lineRect.left()<criticalX && lineRect.right()>criticalX) {
+setPainterPen(painter, fadePen, gradientOffset);
+} else {
+setPainterPen(painter, normalPen, gradientOffset);
+}
+#else
+if (lineRect.left()<criticalX && lineRect.right()>criticalX) {
+painter->setPen(fadePen);
+} else {
+painter->setPen(normalPen);
+}
 #endif // HB_FADE_EFFECT_WORKAROUND_ON_PHONE
-QRectF currentCenter(centerRect);
+line.draw(painter, mOffsetPos);
+} // for i
-if(lineRect.top()>maxY) {
+}
-// stop painting line by line
-return i; // current line won't be painted at all
+/*
-}
+This method is used to draw center part of lines.
+It is also used to calculate range of lines needed for painting in this range.
-if(lineRect.left()<leftBorder) {
+*/
+int HbTextItemPrivate::paintArea(QPainter *painter,
+int firstItemToPaint,
+const QPen& normalPen,
+qreal lastValidY) const
+{
+int i;
+const int n = mTextLayout.lineCount();
+#ifndef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+painter->setPen(normalPen);
+#endif
+for(i=firstItemToPaint; i<n; ++i) {
+QTextLine line = mTextLayout.lineAt(i);
+QRectF lineRect = line.naturalTextRect();
+lineRect.translate(mOffsetPos);
+if (lineRect.top()>lastValidY) {
+return i;
+}
 #ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
-setPainterPen(painter, leftPen, gradientOffset);
+const QPointF gradientOffset(lineRect.left(),
-#else
+lineRect.top()+line.ascent());
-painter->setPen(leftPen);
-#endif
+setPainterPen(painter, normalPen, gradientOffset);
-painter->setClipRect(leftRect);
+#endif // HB_FADE_EFFECT_WORKAROUND_ON_PHONE
-line.draw(painter, mOffsetPos);
-} else {
+line.draw(painter, mOffsetPos);
-// no fade on this end so extend currentCenter
-currentCenter.setLeft(leftRect.left());
+if (lineRect.bottom()>lastValidY) {
-}
+return i;
+}
-if(lineRect.right()>rightBorder) {
+} // for i
-#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+return n-1;
-setPainterPen(painter, rightPen, gradientOffset);
+}
-#else
-painter->setPen(rightPen);
+bool HbTextItemPrivate::setClipPath(QPainter *painter,
-#endif
+const QRectF& rect,
-painter->setClipRect(rightRect);
+const QPainterPath& initialCliping) const
-line.draw(painter, mOffsetPos);
+{
-} else {
+if (initialCliping.isEmpty()) {
-// no fade on this end so extend currentCenter
+painter->setClipRect(rect);
-currentCenter.setRight(rightRect.right());
+} else {
-}
+QPainterPath newPath(rect.topLeft());
+newPath.addRect(rect);
-if(currentCenter.width()>0) {
-#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+if (!initialCliping.intersects(newPath)) {
-setPainterPen(painter, centerPen, gradientOffset);
+return false; // dont paint
-#else
+}
-painter->setPen(centerPen);
+newPath = initialCliping.intersected(newPath);
-#endif
-painter->setClipRect(currentCenter);
+painter->setClipPath(newPath);
-line.draw(painter, mOffsetPos);
+}
-}
+return true;
+}
-if(lineRect.bottom()>maxY) {
-// stop painting line by line
-return i; // current line has been painted partially
-}
-} // for loop
-return n;
-} // paintFaded()
 void HbTextItemPrivate::paintWithFadeEffect(QPainter *painter) const
 {
 Q_Q(const HbTextItem);
 QLinearGradient gradient;
 setupGradient(&gradient, q->textColor());
+const QPainterPath initialClipPath = painter->clipPath();
 const QRectF contentRect = q->contentsRect();
 int i=0;
 const int n = mTextLayout.lineCount();
 QRectF centerRect(mFadeToRect);
 if(mTextLayout.lineAt(0).y()+mOffsetPos.y()<contentRect.top()) {
 centerRect.setTop(mFadeFromRect.top());
+// top center gradient (==):
+QPointF from(mFadeFromRect.topLeft());
+gradient.setStart(mFadeFromRect.left(),mFadeToRect.top());
+gradient.setFinalStop(from);
+QBrush centerBrush(gradient);
+QPen centerPen;
+centerPen.setBrush(centerBrush);
+if (setClipPath(painter,
+QRectF(gradient.start(), mFadeFromRect.topRight()),
+initialClipPath)) {
+i = paintArea(painter, 0, centerPen, from.y());
+} else {
+i = 0;
+}
 // top left gradient (//):
-QPointF from(mFadeFromRect.topLeft());
 gradient.setStart(from.x()-mCornerFadeX, from.y()-mCornerFadeY);
-gradient.setFinalStop(from);
 QBrush leftBrush(gradient);
 QPen leftPen;
 leftPen.setBrush(leftBrush);
+if (setClipPath(painter,
-// top center gradient (==):
+QRectF(mFadeToRect.topLeft(), mFadeFromRect.topLeft()),
-gradient.setStart(mFadeFromRect.left(),mFadeToRect.top());
+initialClipPath)) {
-QBrush centerBrush(gradient);
+paintArea(painter, 0, i, centerPen, leftPen, contentRect.left()-KFadeTolerance);
-QPen centerPen;
+}
-centerPen.setBrush(centerBrush);
 // top right gradient (\\):
 from = mFadeFromRect.topRight();
 gradient.setStart(from.x()+mCornerFadeX, from.y()-mCornerFadeY);
 gradient.setFinalStop(from);
 QBrush rightBrush(gradient);
 QPen rightPen;
 rightPen.setBrush(rightBrush);
-QRectF clipTo(mFadeToRect);
+if (setClipPath(painter,
-clipTo.setBottom(mFadeFromRect.top());
+QRectF(mFadeToRect.topRight(), mFadeFromRect.topRight()),
-i = paintFaded(painter, 0, leftPen, centerPen, rightPen, clipTo);
+initialClipPath)) {
-}
+paintArea(painter, 0, i, centerPen, rightPen, contentRect.right()+KFadeTolerance);
+}
+}
+bool paintBottom = false;
 if(mTextLayout.lineAt(n-1).naturalTextRect().bottom()+mOffsetPos.y()>contentRect.bottom()) {
 // bottom fade is needed here
 centerRect.setBottom(mFadeFromRect.bottom());
+paintBottom = true;
 }
 // paint center part
 {
+int startFrom = i;
+QPen centerPen(q->textColor());
+if (setClipPath(painter,
+QRectF(QPointF(mFadeFromRect.left(), centerRect.top()),
+QPointF(mFadeFromRect.right(), centerRect.bottom())),
+initialClipPath)) {
+// center with no gradient:
+i = paintArea(painter, i, centerPen, centerRect.bottom());
+}
 // left gradient | ||
 gradient.setStart(mFadeToRect.left(), mFadeFromRect.top());
 gradient.setFinalStop(mFadeFromRect.topLeft());
 QBrush leftBrush(gradient);
 QPen leftPen;
 leftPen.setBrush(leftBrush);
+if (setClipPath(painter,
-// center with no gradient:
+QRectF(centerRect.topLeft(),
-QPen centerPen(q->textColor());
+QPointF(mFadeFromRect.left(),
+centerRect.bottom())),
-// top right gradient || |
+initialClipPath)) {
+paintArea(painter, startFrom, i, centerPen, leftPen, contentRect.left()-KFadeTolerance);
+}
+// right gradient || |
 gradient.setStart(mFadeToRect.right(), mFadeFromRect.top());
 gradient.setFinalStop(mFadeFromRect.topRight());
 QBrush rightBrush(gradient);
 QPen rightPen;
 rightPen.setBrush(rightBrush);
-i = paintFaded(painter, i, leftPen, centerPen, rightPen, centerRect);
+if (setClipPath(painter,
+QRectF(QPointF(mFadeFromRect.right(), centerRect.top()),
+centerRect.bottomRight()),
+initialClipPath)) {
+paintArea(painter, startFrom, i, centerPen, rightPen, contentRect.right()+KFadeTolerance);
+}
 }
 // need to draw bottom as faded? is some lines remained?
-if(i<n) {
+if (paintBottom) {
-// bottom left gradient (\\):
+int startFrom = i;
+// bottom center gradient (==):
 QPointF from(mFadeFromRect.bottomLeft());
-gradient.setStart(from.x()-mCornerFadeX, from.y()+mCornerFadeY);
 gradient.setFinalStop(from);
-QBrush leftBrush(gradient);
-QPen leftPen;
-leftPen.setBrush(leftBrush);
-// bottom center gradient (==):
 gradient.setStart(mFadeFromRect.left(),mFadeToRect.bottom());
 QBrush centerBrush(gradient);
 QPen centerPen;
 centerPen.setBrush(centerBrush);
+if (setClipPath(painter,
+QRectF(mFadeFromRect.bottomLeft(),
+QPointF(mFadeFromRect.right(), mFadeToRect.bottom())),
+initialClipPath)) {
+// center with no gradient:
+i = paintArea(painter, i, centerPen, mFadeToRect.bottom());
+}
+// bottom left gradient (\\):
+gradient.setStart(from.x()-mCornerFadeX, from.y()+mCornerFadeY);
+QBrush leftBrush(gradient);
+QPen leftPen;
+leftPen.setBrush(leftBrush);
+if (setClipPath(painter,
+QRectF(mFadeFromRect.bottomLeft(),
+mFadeToRect.bottomLeft()),
+initialClipPath)) {
+// center with no gradient:
+paintArea(painter, startFrom, i, centerPen, leftPen, contentRect.left()-KFadeTolerance);
+}
 // bottom right gradient (//):
 from = mFadeFromRect.bottomRight();
 gradient.setStart(from.x()+mCornerFadeX, from.y()+mCornerFadeY);
 gradient.setFinalStop(from);
 QBrush rightBrush(gradient);
 QPen rightPen;
 rightPen.setBrush(rightBrush);
-QRectF clipTo(mFadeToRect);
+if (setClipPath(painter,
-clipTo.setTop(mFadeFromRect.bottom());
+QRectF(mFadeFromRect.bottomRight(),
-i = paintFaded(painter, 0, leftPen, centerPen, rightPen, clipTo);
+mFadeToRect.bottomRight()),
-}
+initialClipPath)) {
+// center with no gradient:
+paintArea(painter, startFrom, i, centerPen, rightPen, contentRect.right()+KFadeTolerance);
+}
+}
+// restoring initial clipping region
+painter->setClipPath(initialClipPath);
 }
 void HbTextItemPrivate::setFadeLengths(qreal xLength, qreal yLength)
 {
 static const qreal KMinDiff = 0.5;
 }
 QRectF HbTextItemPrivate::boundingRect (const QRectF& contentsRect) const
 {
 QRectF result(layoutBoundingRect());
-if(!mDontClip) {
+if(q_ptr->flags().testFlag(QGraphicsItem::ItemClipsToShape)) {
 // clip
 QRectF clippedTo = contentsRect;
 qreal dx = qMin(mFadeLengthX, (qreal)0.0);
 qreal dy = qMin(mFadeLengthY, (qreal)0.0);
 {
 Q_D(HbTextItem);
 Q_UNUSED(option);
 Q_UNUSED(widget);
+// optimalization:
+if (option->exposedRect.isEmpty()) {
+return;
+}
 // Save painter's state
 QPen oldPen = painter->pen();
 if (HbTextItemPrivate::outlinesEnabled){
 // to see border - bounding rect was clipping bottom and right border
 rect.adjust(0, 0, -1.0, -1.0);
 painter->drawRect(rect);
 }
-if(!d->mDontPrint) {
 painter->setPen(textColor());
 Q_ASSERT(d->mPaintFaded == d->fadeNeeded(contentsRect()));
-if(!d->mDontClip && d->mPaintFaded ) {
+if(d->mPaintFaded ) {
 d->paintWithFadeEffect(painter);
 } else {
 d->mTextLayout.draw(painter,
 d->mOffsetPos,
 QVector<QTextLayout::FormatRange>(),
-d->mDontClip?QRectF():contentsRect());
+flags().testFlag(ItemClipsToShape)?contentsRect():QRectF());
 }
-}
 // Restore painter's state
 painter->setPen(oldPen);
 }
 /*!
 Shows (default) or hides text.
 Size hint remains unchanged (same as when text is visible).
-\sa HbTextItem::isVisible()
+Equvalent of QGraphicsItem::setVisible(bool)
 */
 void HbTextItem::setTextVisible(bool isVisible)
 {
-Q_D(HbTextItem);
+setVisible(isVisible);
-if( d->mDontPrint == isVisible ) {
-d->mDontPrint = !isVisible;
-update();
-}
 }
 /*!
 Returns if text is visible.
 \sa HbTextItem::setTextVisible(bool)
+Equvalent of QGraphicsItem::isVisible()
 */
 bool HbTextItem::isTextVisible() const
 {
-Q_D(const HbTextItem);
+return isVisible();
-return !d->mDontPrint;
+}
-}
+/*!
-/*!
+enables (default) od disables text cliping when item geometry is to small.
-enables (default) or disables text clipping when item geometry is too small.
 \sa HbTextItem::isTextClip()
+Equvalent of QGraphicsItem::setFlag(QGraphicsItem::ItemClipsToShape, clipping)
 */
 void HbTextItem::setTextClip(bool clipping)
 {
-Q_D(HbTextItem);
+setFlag(QGraphicsItem::ItemClipsToShape, clipping);
-if( d->mDontClip == clipping ) {
+}
-prepareGeometryChange();
-d->mDontClip = !clipping;
+/*!
-setFlag(QGraphicsItem::ItemClipsToShape, clipping);
+Returns true if text is cliped when item geometry is to small.
-update();
-}
-}
-/*!
-Returns true if text is clipped when item geometry is too small.
 \sa HbTextItem::setTextClip(bool)
+Equvalent of QGraphicsItem::flags().testFlag(QGraphicsItem::ItemClipsToShape)
 */
 bool HbTextItem::isTextClip() const
 {
-Q_D(const HbTextItem);
+return flags().testFlag(ItemClipsToShape);
-return !d->mDontClip;
 }
 /*!
 Sets minimum number of lines for text item. If minimum number of lines is set,
 then text item will always draw at least this number of lines.

changeset 3	11d3954df52a
parent 1	f7ac710697a9
child 6	c3690ec91ef8