diff options
| -rw-r--r-- | kde-base/kwin/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kwin/files/4.3.3-fix_no_opengl.patch | 36 | ||||
| -rw-r--r-- | kde-base/kwin/files/4.3.5-magiclamp-minimize.patch | 151 |
3 files changed, 5 insertions, 188 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog index a4d0d2bb3b21..175a4c685587 100644 --- a/kde-base/kwin/ChangeLog +++ b/kde-base/kwin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kwin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.206 2010/08/09 17:34:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.207 2010/08/10 13:22:56 scarabeus Exp $ + + 10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -files/4.3.3-fix_no_opengl.patch, -files/4.3.5-magiclamp-minimize.patch: + Drop unused patch. 09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> kwin-4.4.5.ebuild: Drop alpha ia64 and sparc per the AT Lead permission. diff --git a/kde-base/kwin/files/4.3.3-fix_no_opengl.patch b/kde-base/kwin/files/4.3.3-fix_no_opengl.patch deleted file mode 100644 index 818ad92a391d..000000000000 --- a/kde-base/kwin/files/4.3.3-fix_no_opengl.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- trunk/KDE/kdebase/workspace/kwin/effects/logout/logout.cpp 2009/10/05 09:47:13 1031490 -+++ trunk/KDE/kdebase/workspace/kwin/effects/logout/logout.cpp 2009/10/07 15:10:15 1032334 -@@ -110,11 +110,11 @@ - frameDelay = 2; - } - } --#endif - - if( frameDelay ) - --frameDelay; - else -+#endif - { - if( logoutWindow != NULL && !logoutWindowClosed ) - progress = qMin( 1.0, progress + time / animationTime( 2000.0 )); -@@ -234,14 +234,16 @@ - - void LogoutEffect::postPaintScreen() - { -+#ifdef KWIN_HAVE_OPENGL_COMPOSITING - if(( progress != 0.0 && progress != 1.0 ) || frameDelay ) -- { - effects->addRepaintFull(); -- } -+#else -+ if( progress != 0.0 && progress != 1.0 ) -+ effects->addRepaintFull(); -+#endif -+ - if( progress > 0.0 ) -- { - logoutWindowPassed = false; -- } - effects->postPaintScreen(); - } - diff --git a/kde-base/kwin/files/4.3.5-magiclamp-minimize.patch b/kde-base/kwin/files/4.3.5-magiclamp-minimize.patch deleted file mode 100644 index b3901f0c98b5..000000000000 --- a/kde-base/kwin/files/4.3.5-magiclamp-minimize.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/kwin/effects/magiclamp/magiclamp.cpp b/kwin/effects/magiclamp/magiclamp.cpp -index e1572cb..44406a2 100644 ---- a/kwin/effects/magiclamp/magiclamp.cpp -+++ b/kwin/effects/magiclamp/magiclamp.cpp -@@ -301,6 +301,11 @@ void MagicLampEffect::postPaintScreen() - effects->postPaintScreen(); - } - -+void MagicLampEffect::windowDeleted( EffectWindow* w ) -+{ -+ mTimeLineWindows.remove( w ); -+} -+ - void MagicLampEffect::windowMinimized( EffectWindow* w ) - { - mTimeLineWindows[w].setCurveShape(TimeLine::LinearCurve); -diff --git a/kwin/effects/magiclamp/magiclamp.h b/kwin/effects/magiclamp/magiclamp.h -index a7f134d..84bfa7e 100644 ---- a/kwin/effects/magiclamp/magiclamp.h -+++ b/kwin/effects/magiclamp/magiclamp.h -@@ -38,6 +38,7 @@ class MagicLampEffect - virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data ); - virtual void postPaintScreen(); - -+ virtual void windowDeleted( EffectWindow* c ); - virtual void windowMinimized( EffectWindow* c ); - virtual void windowUnminimized( EffectWindow* c ); - -diff --git a/kwin/effects/minimizeanimation/minimizeanimation.cpp b/kwin/effects/minimizeanimation/minimizeanimation.cpp -index 9432504..905a64b 100644 ---- a/kwin/effects/minimizeanimation/minimizeanimation.cpp -+++ b/kwin/effects/minimizeanimation/minimizeanimation.cpp -@@ -39,34 +39,39 @@ void MinimizeAnimationEffect::prePaintScreen( ScreenPrePaintData& data, int time - // whole screen won't be repainted, resulting in artefacts - data.mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS; - -- effects->prePaintScreen(data, time); -- } -- --void MinimizeAnimationEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& data, int time ) -- { -- if( mTimeLineWindows.contains( w )) -+ QHash< EffectWindow*, TimeLine >::iterator entry = mTimeLineWindows.begin(); -+ bool erase = false; -+ while( entry != mTimeLineWindows.end() ) - { -- if( w->isMinimized() ) -+ TimeLine &timeline = entry.value(); -+ if( entry.key()->isMinimized() ) - { -- mTimeLineWindows[w].addTime(time); -- if( mTimeLineWindows[w].progress() >= 1.0f ) -- mTimeLineWindows.remove( w ); -+ timeline.addTime(time); -+ erase = (timeline.progress() >= 1.0f); - } - else - { -- mTimeLineWindows[w].removeTime(time); -- if( mTimeLineWindows[w].progress() <= 0.0f ) -- mTimeLineWindows.remove( w ); -+ timeline.removeTime(time); -+ erase = (timeline.progress() <= 0.0f); - } -+ if( erase ) -+ entry = mTimeLineWindows.erase( entry ); -+ else -+ ++entry; -+ } - -- // Schedule window for transformation if the animation is still in -- // progress -- if( mTimeLineWindows.contains( w )) -- { -- // We'll transform this window -- data.setTransformed(); -- w->enablePainting( EffectWindow::PAINT_DISABLED_BY_MINIMIZE ); -- } -+ effects->prePaintScreen(data, time); -+ } -+ -+void MinimizeAnimationEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& data, int time ) -+ { -+ // Schedule window for transformation if the animation is still in -+ // progress -+ if( mTimeLineWindows.contains( w ) ) -+ { -+ // We'll transform this window -+ data.setTransformed(); -+ w->enablePainting( EffectWindow::PAINT_DISABLED_BY_MINIMIZE ); - } - - effects->prePaintWindow( w, data, time ); -@@ -74,10 +79,11 @@ void MinimizeAnimationEffect::prePaintWindow( EffectWindow* w, WindowPrePaintDat - - void MinimizeAnimationEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data ) - { -- if( mTimeLineWindows.contains( w )) -+ QHash< EffectWindow*, TimeLine >::const_iterator entry = mTimeLineWindows.find(w); -+ if( entry != mTimeLineWindows.constEnd() ) - { - // 0 = not minimized, 1 = fully minimized -- double progress = mTimeLineWindows[w].value(); -+ double progress = entry->value(); - - QRect geo = w->geometry(); - QRect icon = w->iconGeometry(); -@@ -107,18 +113,25 @@ void MinimizeAnimationEffect::postPaintScreen() - effects->postPaintScreen(); - } - -+void MinimizeAnimationEffect::windowDeleted( EffectWindow* w ) -+ { -+ mTimeLineWindows.remove( w ); -+ } -+ - void MinimizeAnimationEffect::windowMinimized( EffectWindow* w ) - { -- mTimeLineWindows[w].setCurveShape(TimeLine::EaseInCurve); -- mTimeLineWindows[w].setDuration( animationTime( 250 )); -- mTimeLineWindows[w].setProgress(0.0f); -+ TimeLine &timeline = mTimeLineWindows[w]; -+ timeline.setCurveShape(TimeLine::EaseInCurve); -+ timeline.setDuration( animationTime( 250 )); -+ timeline.setProgress(0.0f); - } - - void MinimizeAnimationEffect::windowUnminimized( EffectWindow* w ) - { -- mTimeLineWindows[w].setCurveShape(TimeLine::EaseOutCurve); -- mTimeLineWindows[w].setDuration( animationTime( 250 )); -- mTimeLineWindows[w].setProgress(1.0f); -+ TimeLine &timeline = mTimeLineWindows[w]; -+ timeline.setCurveShape(TimeLine::EaseOutCurve); -+ timeline.setDuration( animationTime( 250 )); -+ timeline.setProgress(1.0f); - } - - } // namespace -diff --git a/kwin/effects/minimizeanimation/minimizeanimation.h b/kwin/effects/minimizeanimation/minimizeanimation.h -index d8abd8c..96e4578 100644 ---- a/kwin/effects/minimizeanimation/minimizeanimation.h -+++ b/kwin/effects/minimizeanimation/minimizeanimation.h -@@ -42,6 +42,7 @@ class MinimizeAnimationEffect - virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data ); - virtual void postPaintScreen(); - -+ virtual void windowDeleted( EffectWindow* c ); - virtual void windowMinimized( EffectWindow* c ); - virtual void windowUnminimized( EffectWindow* c ); - |