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

* another, perhaps slightly paranoiac, removeSceneEventFilter

Browse Source 
* don't paint the handle behind the applet, based on its shape(). this prevents it from interfering with translucency, etc of the applet itself

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=760188
This commit is contained in:
Aaron J. Seigo 2008-01-12 06:03:54 +00:00
parent 16dab9574f
commit d53ccc3b00
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
applethandle.cpp
View File

@ -146,7 +146,17 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
gr.setColorAt(0.1, KColorScheme::shade(m_gradientColor, KColorScheme::LightShade));
gr.setColorAt(1, KColorScheme::shade(m_gradientColor, KColorScheme::DarkShade));
painter->setBrush(gr);
painter->drawPath(Plasma::roundedRectangle(boundingRect(), 10));
QPainterPath path = Plasma::roundedRectangle(boundingRect(), 10);
if (m_applet) {
QPainterPath shape = m_applet->shape();
if (!shape.isEmpty()) {
path = path.subtracted(m_applet->mapToParent(m_applet->shape()));
}
}
painter->drawPath(path);
painter->restore();
QPointF point = m_rect.topLeft();
@ -260,7 +270,7 @@ void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event)
void AppletHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
kDebug() << "button pressed:" << m_pressedButton << ", fade pending?" << m_pendingFade;
//kDebug() << "button pressed:" << m_pressedButton << ", fade pending?" << m_pendingFade;
if (m_applet) {
m_applet->removeSceneEventFilter(this);
}
@ -528,6 +538,10 @@ void AppletHandle::fadeAnimation(qreal progress)
m_opacity += (endOpacity-m_opacity)*progress;
if (progress>=1.0 && m_anim==FadeOut) {
if (m_applet) {
m_applet->removeSceneEventFilter(this);
}
emit disappearDone(this);
}