yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mart/newSlidingPopups'

Browse source 
REVIEW:115630
This commit is contained in:
Marco Martin 2014-02-14 14:28:59 +01:00
commit 727aa1e5ca
2 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
effects/slidingpopups/slidingpopups.cpp
View file

@ -22,12 +22,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KConfigGroup> #include <KDE/KConfigGroup>
#include <QTimeLine> #include <QTimeLine>
#include <QApplication>
namespace KWin namespace KWin
{ {
SlidingPopupsEffect::SlidingPopupsEffect() SlidingPopupsEffect::SlidingPopupsEffect()
{ {
mSlideLength = QFontMetrics(qApp->font()).height() * 8;
mAtom = effects->announceSupportProperty("_KDE_SLIDE", this); mAtom = effects->announceSupportProperty("_KDE_SLIDE", this);
connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*))); connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*))); connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
@ -44,7 +47,7 @@ void SlidingPopupsEffect::reconfigure(ReconfigureFlags flags)
{ {
Q_UNUSED(flags) Q_UNUSED(flags)
KConfigGroup conf = effects->effectConfig(QStringLiteral("SlidingPopups")); KConfigGroup conf = effects->effectConfig(QStringLiteral("SlidingPopups"));
mFadeInTime = animationTime(conf, QStringLiteral("SlideInTime"), 250); mFadeInTime = animationTime(conf, QStringLiteral("SlideInTime"), 150);
mFadeOutTime = animationTime(conf, QStringLiteral("SlideOutTime"), 250); mFadeOutTime = animationTime(conf, QStringLiteral("SlideOutTime"), 250);
QHash< const EffectWindow*, QTimeLine* >::iterator it = mAppearingWindows.begin(); QHash< const EffectWindow*, QTimeLine* >::iterator it = mAppearingWindows.begin();
while (it != mAppearingWindows.end()) { while (it != mAppearingWindows.end()) {
@ -103,9 +106,16 @@ void SlidingPopupsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& da
const QRect screenRect = effects->clientArea(FullScreenArea, w->screen(), effects->currentDesktop()); const QRect screenRect = effects->clientArea(FullScreenArea, w->screen(), effects->currentDesktop());
const QRect geo = w->expandedGeometry(); const QRect geo = w->expandedGeometry();
// filter out window quads, but only if the window does not start from the edge // filter out window quads, but only if the window does not start from the edge
int slideLength;
if (mWindowsData[ w ].slideLength > 0) {
slideLength = mWindowsData[ w ].slideLength;
} else {
slideLength = mSlideLength;
}
switch(mWindowsData[ w ].from) { switch(mWindowsData[ w ].from) {
case West: { case West: {
const double splitPoint = geo.width() - (geo.x() + geo.width() - screenRect.x() - start) + geo.width() * (appearing ? 1.0 - progress : progress); const double splitPoint = geo.width() - (geo.x() + geo.width() - screenRect.x() - start) + qMin(geo.width(), slideLength) * (appearing ? 1.0 - progress : progress);
data.quads = data.quads.splitAtX(splitPoint); data.quads = data.quads.splitAtX(splitPoint);
WindowQuadList filtered; WindowQuadList filtered;
foreach (const WindowQuad &quad, data.quads) { foreach (const WindowQuad &quad, data.quads) {
@ -117,7 +127,7 @@ void SlidingPopupsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& da
break; break;
} }
case North: { case North: {
const double splitPoint = geo.height() - (geo.y() + geo.height() - screenRect.y() - start) + geo.height() * (appearing ? 1.0 - progress : progress); const double splitPoint = geo.height() - (geo.y() + geo.height() - screenRect.y() - start) + qMin(geo.height(), slideLength) * (appearing ? 1.0 - progress : progress);
data.quads = data.quads.splitAtY(splitPoint); data.quads = data.quads.splitAtY(splitPoint);
WindowQuadList filtered; WindowQuadList filtered;
foreach (const WindowQuad &quad, data.quads) { foreach (const WindowQuad &quad, data.quads) {
@ -129,7 +139,7 @@ void SlidingPopupsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& da
break; break;
} }
case East: { case East: {
const double splitPoint = screenRect.x() + screenRect.width() - geo.x() - start - geo.width() * (appearing ? 1.0 - progress : progress); const double splitPoint = screenRect.x() + screenRect.width() - geo.x() - start - qMin(geo.width(), slideLength) * (appearing ? 1.0 - progress : progress);
data.quads = data.quads.splitAtX(splitPoint); data.quads = data.quads.splitAtX(splitPoint);
WindowQuadList filtered; WindowQuadList filtered;
foreach (const WindowQuad &quad, data.quads) { foreach (const WindowQuad &quad, data.quads) {
@ -142,7 +152,7 @@ void SlidingPopupsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& da
} }
case South: case South:
default: { default: {
const double splitPoint = screenRect.y() + screenRect.height() - geo.y() - start - geo.height() * (appearing ? 1.0 - progress : progress); const double splitPoint = screenRect.y() + screenRect.height() - geo.y() - start - qMin(geo.height(), slideLength) * (appearing ? 1.0 - progress : progress);
data.quads = data.quads.splitAtY(splitPoint); data.quads = data.quads.splitAtY(splitPoint);
WindowQuadList filtered; WindowQuadList filtered;
foreach (const WindowQuad &quad, data.quads) { foreach (const WindowQuad &quad, data.quads) {
@ -184,28 +194,47 @@ void SlidingPopupsEffect::paintWindow(EffectWindow* w, int mask, QRegion region,
} }
const int start = mWindowsData[ w ].start; const int start = mWindowsData[ w ].start;
int slideLength;
if (mWindowsData[ w ].slideLength > 0) {
slideLength = mWindowsData[ w ].slideLength;
} else {
slideLength = mSlideLength;
}
const QRect screenRect = effects->clientArea(FullScreenArea, w->screen(), w->desktop()); const QRect screenRect = effects->clientArea(FullScreenArea, w->screen(), w->desktop());
int splitPoint = 0; int splitPoint = 0;
const QRect geo = w->expandedGeometry(); const QRect geo = w->expandedGeometry();
switch(mWindowsData[ w ].from) { switch(mWindowsData[ w ].from) {
case West: case West:
data.translate(- geo.width() * progress); if (slideLength < geo.width()) {
data.multiplyOpacity(1 - progress);
}
data.translate(- qMin(geo.width(), slideLength) * progress);
splitPoint = geo.width() - (geo.x() + geo.width() - screenRect.x() - start); splitPoint = geo.width() - (geo.x() + geo.width() - screenRect.x() - start);
region = QRegion(geo.x() + splitPoint, geo.y(), geo.width() - splitPoint, geo.height()); region = QRegion(geo.x() + splitPoint, geo.y(), geo.width() - splitPoint, geo.height());
break; break;
case North: case North:
data.translate(0.0, - geo.height() * progress); if (slideLength < geo.height()) {
data.multiplyOpacity(1 - progress);
}
data.translate(0.0, - qMin(geo.height(), slideLength) * progress);
splitPoint = geo.height() - (geo.y() + geo.height() - screenRect.y() - start); splitPoint = geo.height() - (geo.y() + geo.height() - screenRect.y() - start);
region = QRegion(geo.x(), geo.y() + splitPoint, geo.width(), geo.height() - splitPoint); region = QRegion(geo.x(), geo.y() + splitPoint, geo.width(), geo.height() - splitPoint);
break; break;
case East: case East:
data.translate(geo.width() * progress); if (slideLength < geo.width()) {
data.multiplyOpacity(1 - progress);
}
data.translate(qMin(geo.width(), slideLength) * progress);
splitPoint = screenRect.x() + screenRect.width() - geo.x() - start; splitPoint = screenRect.x() + screenRect.width() - geo.x() - start;
region = QRegion(geo.x(), geo.y(), splitPoint, geo.height()); region = QRegion(geo.x(), geo.y(), splitPoint, geo.height());
break; break;
case South: case South:
default: default:
data.translate(0.0, geo.height() * progress); if (slideLength < geo.width()) {
data.multiplyOpacity(1 - progress);
}
data.translate(0.0, qMin(geo.height(), slideLength) * progress);
splitPoint = screenRect.y() + screenRect.height() - geo.y() - start; splitPoint = screenRect.y() + screenRect.height() - geo.y() - start;
region = QRegion(geo.x(), geo.y(), geo.width(), splitPoint); region = QRegion(geo.x(), geo.y(), geo.width(), splitPoint);
} }
@ -281,12 +310,21 @@ void SlidingPopupsEffect::slotPropertyNotify(EffectWindow* w, long a)
Data animData; Data animData;
animData.start = d[ 0 ]; animData.start = d[ 0 ];
animData.from = (Position)d[ 1 ]; animData.from = (Position)d[ 1 ];
//custom duration
if (data.length() >= (int)(sizeof(uint32_t) * 3)) { if (data.length() >= (int)(sizeof(uint32_t) * 3)) {
animData.fadeInDuration = d[2]; animData.fadeInDuration = d[2];
if (data.length() >= (int)(sizeof(uint32_t) * 4)) if (data.length() >= (int)(sizeof(uint32_t) * 4))
//custom fadein
animData.fadeOutDuration = d[3]; animData.fadeOutDuration = d[3];
else else
//custom fadeout
animData.fadeOutDuration = d[2]; animData.fadeOutDuration = d[2];
//do we want an actual slide?
if (data.length() >= (int)(sizeof(uint32_t) * 5))
animData.slideLength = d[5];
else
animData.slideLength = 0;
} else { } else {
animData.fadeInDuration = animationTime(mFadeInTime); animData.fadeInDuration = animationTime(mFadeInTime);
animData.fadeOutDuration = animationTime(mFadeOutTime); animData.fadeOutDuration = animationTime(mFadeOutTime);

2
effects/slidingpopups/slidingpopups.h
View file

@ -71,11 +71,13 @@ private:
Position from; Position from;
int fadeInDuration; int fadeInDuration;
int fadeOutDuration; int fadeOutDuration;
int slideLength;
}; };
long mAtom; long mAtom;
QHash< const EffectWindow*, QTimeLine* > mAppearingWindows; QHash< const EffectWindow*, QTimeLine* > mAppearingWindows;
QHash< const EffectWindow*, QTimeLine* > mDisappearingWindows; QHash< const EffectWindow*, QTimeLine* > mDisappearingWindows;
QHash< const EffectWindow*, Data > mWindowsData; QHash< const EffectWindow*, Data > mWindowsData;
int mSlideLength;
int mFadeInTime; int mFadeInTime;
int mFadeOutTime; int mFadeOutTime;
}; };