alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fix titleRect calculation

Browse Source 
* move some more unneeded-if-titlerect-is-empty code beneath the short circuiting if statement in the paint method

svn path=/trunk/KDE/kdelibs/; revision=1111862
This commit is contained in:
Aaron J. Seigo 2010-04-06 20:42:25 +00:00
parent 61ca96b034
commit b1ca5781b9
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
extenders/extenderitem.cpp
View File

@ -510,6 +510,13 @@ void ExtenderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
return; return;
} }
QRectF titleRect = d->titleRect();
QSizeF titleSize = titleRect.size();
if (titleSize.isEmpty()) {
kDebug() << "title size is empty for" << d->title;
return;
}
//set the font for the title. //set the font for the title.
Plasma::Theme *theme = Plasma::Theme::defaultTheme(); Plasma::Theme *theme = Plasma::Theme::defaultTheme();
QFont font = theme->font(Plasma::Theme::DefaultFont); QFont font = theme->font(Plasma::Theme::DefaultFont);
@ -518,42 +525,38 @@ void ExtenderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
//create a pixmap with the title that is faded out at the right side of the titleRect. //create a pixmap with the title that is faded out at the right side of the titleRect.
QRectF rect; QRectF rect;
if (option->direction == Qt::LeftToRight) { if (option->direction == Qt::LeftToRight) {
rect = QRectF(d->titleRect().width() - 30, 0, 30, d->titleRect().height()); rect = QRectF(titleRect.width() - 30, 0, 30, titleRect.height());
} else { } else {
rect = QRectF(0, 0, 30, d->titleRect().height()); rect = QRectF(0, 0, 30, titleRect.height());
} }
QSize titleSize = d->titleRect().size().toSize(); QPixmap pixmap(titleSize.toSize());
if (!titleSize.isEmpty()) { pixmap.fill(Qt::transparent);
QPixmap pixmap(titleSize);
pixmap.fill(Qt::transparent);
QPainter p(&pixmap); QPainter p(&pixmap);
p.setPen(theme->color(Plasma::Theme::TextColor)); p.setPen(theme->color(Plasma::Theme::TextColor));
p.setFont(font); p.setFont(font);
p.drawText(QRectF(QPointF(0, 0), d->titleRect().size()), p.drawText(QRectF(QPointF(0, 0), titleSize),
Qt::TextSingleLine | Qt::AlignVCenter | Qt::AlignLeft, Qt::TextSingleLine | Qt::AlignVCenter | Qt::AlignLeft,
d->title); d->title);
// Create the alpha gradient for the fade out effect // Create the alpha gradient for the fade out effect
QLinearGradient alphaGradient(0, 0, 1, 0); QLinearGradient alphaGradient(0, 0, 1, 0);
alphaGradient.setCoordinateMode(QGradient::ObjectBoundingMode); alphaGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
//TODO: correct handling of right to left text. //TODO: correct handling of right to left text.
if (option->direction == Qt::LeftToRight) { if (option->direction == Qt::LeftToRight) {
alphaGradient.setColorAt(0, QColor(0, 0, 0, 255)); alphaGradient.setColorAt(0, QColor(0, 0, 0, 255));
alphaGradient.setColorAt(1, QColor(0, 0, 0, 0)); alphaGradient.setColorAt(1, QColor(0, 0, 0, 0));
} else { } else {
alphaGradient.setColorAt(1, QColor(0, 0, 0, 255)); alphaGradient.setColorAt(1, QColor(0, 0, 0, 255));
alphaGradient.setColorAt(0, QColor(0, 0, 0, 0)); alphaGradient.setColorAt(0, QColor(0, 0, 0, 0));
}
p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
p.fillRect(rect, alphaGradient);
p.end();
painter->drawPixmap(d->titleRect().topLeft(), pixmap);
} }
p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
p.fillRect(rect, alphaGradient);
p.end();
painter->drawPixmap(titleRect.topLeft(), pixmap);
} }
void ExtenderItem::moveEvent(QGraphicsSceneMoveEvent *event) void ExtenderItem::moveEvent(QGraphicsSceneMoveEvent *event)
@ -769,8 +772,10 @@ QRectF ExtenderItemPrivate::dragHandleRect()
QRectF ExtenderItemPrivate::titleRect() QRectF ExtenderItemPrivate::titleRect()
{ {
return dragHandleRect().adjusted(dragLeft + collapseIcon->size().width() + 1, dragTop, QRectF rect = dragHandleRect().adjusted(dragLeft + collapseIcon->size().width() + 1, dragTop,
-toolbox->size().width() - dragRight, -dragBottom); -dragRight, -dragBottom);
//kDebug() << dragHandleRect() << rect;
return rect;
} }
void ExtenderItemPrivate::toggleCollapse() void ExtenderItemPrivate::toggleCollapse()