Fixed another uninitialized memory problem. Valgrind rocks. :)
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=875194
This commit is contained in:
parent
68acf18d50
commit
1a63cf107a
@ -416,6 +416,11 @@ void ExtenderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
|||||||
|
|
||||||
d->dragger->paintPanel(painter, QPointF(d->bgLeft, d->bgTop));
|
d->dragger->paintPanel(painter, QPointF(d->bgLeft, d->bgTop));
|
||||||
|
|
||||||
|
//We don't need to paint a title if there is no title.
|
||||||
|
if (d->title.isEmpty()) {
|
||||||
|
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);
|
||||||
@ -423,8 +428,6 @@ void ExtenderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
|||||||
font.setWeight(QFont::Bold);
|
font.setWeight(QFont::Bold);
|
||||||
|
|
||||||
//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.
|
||||||
//TODO: hmm, create something generic for this... there's probably more stuff that wants to have
|
|
||||||
//this functionality
|
|
||||||
QRectF rect = QRectF(d->titleRect().width() - 30, 0, 30, d->titleRect().height());
|
QRectF rect = QRectF(d->titleRect().width() - 30, 0, 30, d->titleRect().height());
|
||||||
|
|
||||||
QPixmap pixmap(d->titleRect().size().toSize());
|
QPixmap pixmap(d->titleRect().size().toSize());
|
||||||
@ -711,11 +714,13 @@ void ExtenderItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
|||||||
ExtenderItemPrivate::ExtenderItemPrivate(ExtenderItem *extenderItem, Extender *hostExtender)
|
ExtenderItemPrivate::ExtenderItemPrivate(ExtenderItem *extenderItem, Extender *hostExtender)
|
||||||
: q(extenderItem),
|
: q(extenderItem),
|
||||||
widget(0),
|
widget(0),
|
||||||
|
toolbox(0),
|
||||||
toplevel(0),
|
toplevel(0),
|
||||||
previousTargetExtender(0),
|
previousTargetExtender(0),
|
||||||
extender(hostExtender),
|
extender(hostExtender),
|
||||||
dragger(new PanelSvg(extenderItem)),
|
dragger(new PanelSvg(extenderItem)),
|
||||||
background(new PanelSvg(extenderItem)),
|
background(new PanelSvg(extenderItem)),
|
||||||
|
collapseIcon(0),
|
||||||
title(QString()),
|
title(QString()),
|
||||||
sourceAppletId(hostExtender->d->applet->id()),
|
sourceAppletId(hostExtender->d->applet->id()),
|
||||||
mousePressed(false),
|
mousePressed(false),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user