vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Plasma/5.12'

icc-effect-5.14.5
Friedrich W. H. Kossebau 2018-04-30 23:50:35 +02:00
parent 16a0e24115 86af84f13e
commit a5a661211c
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
effects/kscreen/kscreen.cpp
View File

@ -105,19 +105,23 @@ void KscreenEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, in
void KscreenEffect::paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) void KscreenEffect::paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data)
{ {
//fade to black and fully opaque
switch (m_state) { switch (m_state) {
case StateFadingOut: case StateFadingOut:
data.multiplyOpacity(1.0 - m_timeLine.currentValue()); data.setOpacity(data.opacity() + (1.0 - data.opacity()) * m_timeLine.currentValue());
break; data.multiplyBrightness(1.0 - m_timeLine.currentValue());
case StateFadedOut: break;
data.multiplyOpacity(0.0); case StateFadedOut:
break; data.multiplyOpacity(0.0);
case StateFadingIn: data.multiplyBrightness(0.0);
data.multiplyOpacity(m_timeLine.currentValue()); break;
break; case StateFadingIn:
default: data.setOpacity(data.opacity() + (1.0 - data.opacity()) * (1.0 - m_timeLine.currentValue()));
// no adjustment data.multiplyBrightness(m_timeLine.currentValue());
break; break;
default:
// no adjustment
break;
} }
effects->paintWindow(w, mask, region, data); effects->paintWindow(w, mask, region, data);
} }

2
effects/maximize/package/contents/code/maximize.js
View File

@ -1,7 +1,7 @@
/******************************************************************** /********************************************************************
This file is part of the KDE project. This file is part of the KDE project.
Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org> Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
effects/morphingpopups/package/contents/code/morphingpopups.js
View File

@ -1,7 +1,7 @@
/******************************************************************** /********************************************************************
This file is part of the KDE project. This file is part of the KDE project.
Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org> Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
Copyright (C) 2016 Marco Martin <mart@kde.org> Copyright (C) 2016 Marco Martin <mart@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify