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

Revert "Avoid too much updates, remove old codes since 4.5 manage the opacity."

Browse Source 
Revert it since it cause some problems, i will investigate

svn path=/trunk/KDE/kdelibs/; revision=929192
This commit is contained in:
Alexis Ménard 2009-02-20 21:30:05 +00:00
parent 6afbdb4870
commit 7f18ee0afa
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
private/applethandle.cpp
View File

@ -129,8 +129,6 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet, const QPointF &h
m_applet->raise(); m_applet->raise();
m_applet->installSceneEventFilter(this); m_applet->installSceneEventFilter(this);
setZValue(m_applet->zValue()); setZValue(m_applet->zValue());
setFlag(QGraphicsItem::ItemDoesntPropagateOpacityToChildren,true);
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
} }
AppletHandle::~AppletHandle() AppletHandle::~AppletHandle()
@ -263,6 +261,34 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
//regenerate our buffer? //regenerate our buffer?
if (m_animId > 0 || !m_backgroundBuffer || m_backgroundBuffer->size() != pixmapSize) { if (m_animId > 0 || !m_backgroundBuffer || m_backgroundBuffer->size() != pixmapSize) {
QColor transparencyColor = Qt::black;
transparencyColor.setAlphaF(qMin(m_opacity, qreal(0.99)));
QLinearGradient g(QPoint(0, 0), QPoint(m_decorationRect.width(), 0));
//fading out panel
if (m_rect.height() > qreal(minimumHeight()) * 1.25) {
if (m_buttonsOnRight) {
qreal opaquePoint =
(m_background->marginSize(LeftMargin) - translation) / m_decorationRect.width();
//kDebug() << "opaquePoint" << opaquePoint
// << m_background->marginSize(LeftMargin) << m_decorationRect.width();
g.setColorAt(0.0, Qt::transparent);
g.setColorAt(qMax(0.0, opaquePoint - 0.05), Qt::transparent);
g.setColorAt(opaquePoint, transparencyColor);
g.setColorAt(1.0, transparencyColor);
} else {
qreal opaquePoint =
1 - ((m_background->marginSize(RightMargin) + translation) / m_decorationRect.width());
g.setColorAt(1.0, Qt::transparent);
g.setColorAt(opaquePoint, Qt::transparent);
g.setColorAt(qMax(0.0, opaquePoint - 0.05), transparencyColor);
g.setColorAt(0.0, transparencyColor);
}
//complete panel
} else {
g.setColorAt(0.0, transparencyColor);
}
m_background->resizeFrame(m_decorationRect.size()); m_background->resizeFrame(m_decorationRect.size());
if (!m_backgroundBuffer || m_backgroundBuffer->size() != pixmapSize) { if (!m_backgroundBuffer || m_backgroundBuffer->size() != pixmapSize) {
@ -298,7 +324,8 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
m_configureIcons->paint(&buffPainter, iconRect, "close"); m_configureIcons->paint(&buffPainter, iconRect, "close");
buffPainter.setCompositionMode(QPainter::CompositionMode_DestinationIn); buffPainter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
setOpacity(m_opacity); //blend the background
buffPainter.fillRect(m_backgroundBuffer->rect(), g);
//blend the icons //blend the icons
//buffPainter.fillRect(QRect(QPoint((int)m_decorationRect.width(), 0), QSize(m_iconSize + 1, //buffPainter.fillRect(QRect(QPoint((int)m_decorationRect.width(), 0), QSize(m_iconSize + 1,
// (int)m_decorationRect.height())), transparencyColor); // (int)m_decorationRect.height())), transparencyColor);
@ -456,6 +483,8 @@ void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event)
event->accept(); event->accept();
update();
//set mousePos to the position in the applet, in screencoords, so it becomes easy //set mousePos to the position in the applet, in screencoords, so it becomes easy
//to reposition the toplevel view to the correct position. //to reposition the toplevel view to the correct position.
QPoint localpos = m_currentView->mapFromScene(m_applet->scenePos()); QPoint localpos = m_currentView->mapFromScene(m_applet->scenePos());
@ -545,6 +574,7 @@ void AppletHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
} }
m_pressedButton = NoButton; m_pressedButton = NoButton;
update();
} }
qreal _k_distanceForPoint(QPointF point) qreal _k_distanceForPoint(QPointF point)
@ -708,6 +738,7 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
setTransform(t); setTransform(t);
m_angle = newAngle; m_angle = newAngle;
m_applet->update();
} else { } else {
QGraphicsItem::mouseMoveEvent(event); QGraphicsItem::mouseMoveEvent(event);
} }