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

we don't need the timer on this one; it's only useful for the desktop toolbox.

Browse Source 
BUG:167782

svn path=/trunk/KDE/kdelibs/; revision=885897
This commit is contained in:
Aaron J. Seigo 2008-11-18 03:37:43 +00:00
parent 1171ef67d8
commit 4f36ceb235
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
private/paneltoolbox.cpp
View File

@ -48,7 +48,6 @@ public:
KIcon icon;
QTime stopwatch;
int animId;
qreal animFrame;
bool toggled;
@ -207,7 +206,7 @@ QPainterPath PanelToolBox::shape() const
void PanelToolBox::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
if (showing() || d->stopwatch.elapsed() < 100) {
if (showing()) {
QGraphicsItem::hoverEnterEvent(event);
return;
}
@ -242,18 +241,15 @@ void PanelToolBox::showToolBox()
// match whatever the time is that moveItem() takes. Same in hoverLeaveEvent().
d->animId = animdriver->customAnimation(
10, 240, Plasma::Animator::EaseInCurve, this, "animate");
d->stopwatch.restart();
}
void PanelToolBox::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
//kDebug() << event->pos() << event->scenePos()
if (d->stopwatch.elapsed() < 100 || d->toggled) {
QGraphicsItem::hoverLeaveEvent(event);
return;
if (!d->toggled) {
hideToolBox();
}
hideToolBox();
QGraphicsItem::hoverLeaveEvent(event);
}
@ -273,8 +269,6 @@ void PanelToolBox::hideToolBox()
setShowing(false);
d->animId = animdriver->customAnimation(
10, 240, Plasma::Animator::EaseOutCurve, this, "animate");
d->stopwatch.restart();
}
void PanelToolBox::animate(qreal progress)