From 5bb6ed0b1a9f64d146b99d2ae27ab14cd8924ba3 Mon Sep 17 00:00:00 2001
From: Rivo Laks <rivolaks@hot.ee>
Date: Fri, 2 Nov 2007 15:33:46 +0000
Subject: [PATCH] Use new shadow texture by pinotree. It uses gaussian blur
 instead of linear falloff   and thus looks better. Also change default shadow
 settings to look better with the new texture.

svn path=/trunk/KDE/kdebase/workspace/; revision=732038
---
 effects/data/shadow-texture.png | Bin 3126 -> 4254 bytes
 effects/shadow.cpp              |  12 ++++++------
 effects/shadow_config.cpp       |  16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/effects/data/shadow-texture.png b/effects/data/shadow-texture.png
index 0be80680432ed945971bd837f54dcdb47231dc28..1b1c4a6837bc04bec79d270d9a5875512c743490 100644
GIT binary patch
literal 4254
zcmbW3%W4!+5QaM%Gf6Z!C_zxc1l);lprA4#8N?vsLN_8lfe=B+N?Zu8%>%e|mlqJh
zS8(OhMFc??@rrk2eLej(H9b8-EGer_Rh|0(Q|I*P!^^A7bF)Whi=vq8uk@~jT|lR&
z;_tQf_0M6ZZe3jN6+8TS{Orl2h|JtxxxQ8ur#H}vH|Op}tmxe7Us~$CoSp9;p4>Qd
z;(1YYPxX7}uU?y(Sm?gmo}gwI(pFDwr=>?*Y^1EMVY4XLWWQOL*BLzfxu*0dM<T-k
z0kvfD^E&VN7g%d<TqEPz;;Vq>9L)vL*HW8vtZT7J9SFymc25;!oqhA}6;S&p68c(d
z@oO1(1vFO$-5W7|tt14%0*sQA1QsDrye82kASlK70HJ_OKr4wz)h7k$ccuD*Yin>e
zW&#<!2@EK;XePrRgr+Fqzmg@-T9E|nl1L_Ck>H+O;C)emx`s$5Ky$#*pP}r>BE$fs
zUK?()BLNak^`zAB3z$_hfFObc_#>2fCI_f0i3kl}0c%O*(*p*0Cv-Y=rn0QbA&mZe
z=(o_Xp_u^W0M|++LZbwTL4pR7kO1KOL+2_z5Ec^DbLualpF)`&A}HhlS3M*(^&>Rc
z1oyrn0Rg}dh0a%&f36_Pso#gb3#A8OK1h1#Q%kNEl59{Uk|*FBVDu0G{8;Fb(1W4u
z;q-vBj|azfpiG8|*w6l0CR9%VpCDq9n`i(D#?9E70N{(2Qoj{S9dF=crA$q5duk&!
z5E^HpK(QE0BN{@2v2*gp(Bq*9WIu%RMz|^-Z3ZWwd&hDhBz7a2RBkvfPVZbdg4LWr
zc`sF!pNp@VyX8(9Gk3lf>d9V*&wrD6jMPxeW6M2aIVw#8ROC(hHT$XY+TVsUV#dx1
z0VlQ{%BKiPew3P@puHnCkW9d&*3DR&aXOm&+Ii*NIRwZ74hbG1YxXb+``8y-3j_$z
z!~~X;qcq5)hXA$20OHd`m=055A}9nP=>D-JoIoZaIGa2@ckO+Xr#WQ!G7y0L83r7M
zlvA)L7OYw&5V2BBxPiu;SS3#k0z5?C0Xc{g2b3H(6L10&i1a`tKw|};LN*DEMTiT;
zUO!{&$)TKFrH=$WV1x!D0oPcI1T!WGd-9JA<T7bVU;);$pE^X0p`T)t6i}?tzzvef
zZ-P4W`Lz0;UIH0sh=70=NW$i<CBUg2f8J+Jo3$_XweQ{91ZxbN)vrKnjy;mpLI7VY
zpn3L`BA9Ef@oWXm)_SbXGZ+LE^R7!Pz)-MSn9~v#T)!$UO$OE{p|8z*>TwSR8w&|&
q8|kr20ky4#d`|x>ZG<vd_Qzt}J$a*h_QBH^6!e!?dz%+--v0|x;eAg4

delta 3121
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
LNkvXXu0mjfy<F;0

diff --git a/effects/shadow.cpp b/effects/shadow.cpp
index 0f900134d1..c8546853ba 100644
--- a/effects/shadow.cpp
+++ b/effects/shadow.cpp
@@ -24,11 +24,11 @@ KWIN_EFFECT( shadow, ShadowEffect )
 ShadowEffect::ShadowEffect()
     {
     KConfigGroup conf = effects->effectConfig("Shadow");
-    shadowXOffset = conf.readEntry( "XOffset", 5 );
-    shadowYOffset = conf.readEntry( "YOffset", 5 );
-    shadowOpacity = conf.readEntry( "Opacity", 0.2 );
+    shadowXOffset = conf.readEntry( "XOffset", 0 );
+    shadowYOffset = conf.readEntry( "YOffset", 3 );
+    shadowOpacity = conf.readEntry( "Opacity", 0.25 );
     shadowFuzzyness = conf.readEntry( "Fuzzyness", 10 );
-    shadowSize = conf.readEntry( "Size", 4 );
+    shadowSize = conf.readEntry( "Size", 5 );
     intensifyActiveShadow = conf.readEntry( "IntensifyActiveShadow", true );
 
     QString shadowtexture =  KGlobal::dirs()->findResource("data", "kwin/shadow-texture.png");
@@ -80,12 +80,12 @@ bool ShadowEffect::useShadow( EffectWindow* w ) const
     }
 
 void ShadowEffect::addQuadVertices(QVector<float>& verts, float x1, float y1, float x2, float y2) const
-{
+    {
     verts << x1 << y1;
     verts << x1 << y2;
     verts << x2 << y2;
     verts << x2 << y1;
-}
+    }
 
 void ShadowEffect::drawShadow( EffectWindow* window, int mask, QRegion region, WindowPaintData& data )
     {
diff --git a/effects/shadow_config.cpp b/effects/shadow_config.cpp
index 98cb79633a..a1d78b7418 100644
--- a/effects/shadow_config.cpp
+++ b/effects/shadow_config.cpp
@@ -87,11 +87,11 @@ void ShadowEffectConfig::load()
     KCModule::load();
 
     KConfigGroup conf = EffectsHandler::effectConfig("Shadow");
-    mShadowXOffset->setValue( conf.readEntry( "XOffset", 5 ) );
-    mShadowYOffset->setValue( conf.readEntry( "YOffset", 5 ) );
-    mShadowOpacity->setValue( (int)( conf.readEntry( "Opacity", 0.2 ) * 100 ) );
+    mShadowXOffset->setValue( conf.readEntry( "XOffset", 0 ) );
+    mShadowYOffset->setValue( conf.readEntry( "YOffset", 3 ) );
+    mShadowOpacity->setValue( (int)( conf.readEntry( "Opacity", 0.25 ) * 100 ) );
     mShadowFuzzyness->setValue( conf.readEntry( "Fuzzyness", 10 ) );
-    mShadowSize->setValue( conf.readEntry( "Size", 4 ) );
+    mShadowSize->setValue( conf.readEntry( "Size", 5 ) );
     mIntensifyActiveShadow->setChecked( conf.readEntry( "IntensifyActiveShadow", true ) );
 
     emit changed(false);
@@ -118,11 +118,11 @@ void ShadowEffectConfig::save()
 void ShadowEffectConfig::defaults()
     {
     kDebug() ;
-    mShadowXOffset->setValue( 5 );
-    mShadowYOffset->setValue( 5 );
-    mShadowOpacity->setValue( 20 );
+    mShadowXOffset->setValue( 0 );
+    mShadowYOffset->setValue( 3 );
+    mShadowOpacity->setValue( 25 );
     mShadowFuzzyness->setValue( 10 );
-    mShadowSize->setValue( 4 );
+    mShadowSize->setValue( 5 );
     mIntensifyActiveShadow->setChecked( true );
     emit changed(true);
     }