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

clean ups, share the FrameSvg object

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1178368
This commit is contained in:
Aaron J. Seigo 2010-09-22 20:47:35 +00:00
parent 9983bc7dc8
commit 521bc968fd
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
widgets/pushbutton.cpp
View File

@ -180,7 +180,6 @@ PushButton::PushButton(QGraphicsWidget *parent)
d->hoverAnimation = Animator::create(Animator::PixmapTransitionAnimation);
d->hoverAnimation->setTargetWidget(this);
d->hoverAnimation->setProperty("startPixmap", d->background->framePixmap());
KPushButton *native = new KPushButton;
connect(native, SIGNAL(pressed()), this, SIGNAL(pressed()));
@ -195,7 +194,7 @@ PushButton::PushButton(QGraphicsWidget *parent)
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
d->focusIndicator = new FocusIndicator(this, "widgets/button");
d->focusIndicator = new FocusIndicator(this, d->background);
d->syncBorders();
setAcceptHoverEvents(true);
@ -333,21 +332,19 @@ void PushButton::resizeEvent(QGraphicsSceneResizeEvent *event)
d->setPixmap();
if (d->background) {
//resize all four panels
d->background->setElementPrefix("pressed");
d->background->resizeFrame(size());
//resize all panels
d->background->setElementPrefix("pressed");
d->background->resizeFrame(size());
d->syncActiveRect();
d->syncActiveRect();
d->background->setElementPrefix("active");
d->background->resizeFrame(d->activeRect.size());
d->hoverAnimation->setProperty("targetPixmap", d->background->framePixmap());
d->background->setElementPrefix("focus");
d->background->resizeFrame(d->activeRect.size());
d->background->setElementPrefix("normal");
d->background->resizeFrame(size());
d->hoverAnimation->setProperty("startPixmap", d->background->framePixmap());
d->background->setElementPrefix("normal");
d->background->resizeFrame(size());
d->hoverAnimation->setProperty("startPixmap", d->background->framePixmap());
d->background->setElementPrefix("active");
d->background->resizeFrame(d->activeRect.size());
d->hoverAnimation->setProperty("targetPixmap", d->background->framePixmap());
}
QGraphicsProxyWidget::resizeEvent(event);
@ -525,7 +522,6 @@ void PushButton::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
d->hoverAnimation->start();
QGraphicsProxyWidget::hoverLeaveEvent(event);
}