[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin/effects
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2008-03-12 22:12:56
Message-ID: 1205359976.096577.9678.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784969 by rivol:

Make shadow's color configurable and use color scheme for finding
  the default value.
Patch by Louai Al-Khanji

 M             data/shadow-texture.png  
 M  +3 -1      shadow.cpp  
 M  +1 -0      shadow.h  
 M  +25 -1     shadow_config.cpp  
 M  +2 -0      shadow_config.h  


--- trunk/KDE/kdebase/workspace/kwin/effects/shadow.cpp #784968:784969
@@ -25,6 +25,7 @@
 #include <kconfiggroup.h>
 #include <kdebug.h>
 #include <KStandardDirs>
+#include <kcolorscheme.h>
 
 namespace KWin
 {
@@ -39,6 +40,7 @@
     shadowOpacity = conf.readEntry( "Opacity", 0.25 );
     shadowFuzzyness = conf.readEntry( "Fuzzyness", 10 );
     shadowSize = conf.readEntry( "Size", 5 );
+    shadowColor = conf.readEntry( "Color",  KColorScheme::shade( Qt::white, \
                KColorScheme::ShadowShade ) );
     intensifyActiveShadow = conf.readEntry( "IntensifyActiveShadow", true );
 
     QString shadowtexture =  KGlobal::dirs()->findResource("data", \
"kwin/shadow-texture.png"); @@ -215,7 +217,7 @@
     {
         opacity = 1 - (1 - shadowOpacity)*(1 - shadowOpacity);
     }
-    glColor4f(0, 0, 0, opacity * data.opacity * (window->width() / (double)w) * \
(window->height() / (double)h)); +    glColor4f(shadowColor.redF(), \
shadowColor.greenF(), shadowColor.blueF(), opacity * data.opacity * (window->width() \
/ (double)w) * (window->height() / (double)h));  glTexEnvi(GL_TEXTURE_ENV, \
GL_TEXTURE_ENV_MODE, GL_MODULATE);  // We have two elements per vertex in the verts \
array  int verticesCount = verts.count() / 2;
--- trunk/KDE/kdebase/workspace/kwin/effects/shadow.h #784968:784969
@@ -52,6 +52,7 @@
         int shadowFuzzyness;
         int shadowSize;
         bool intensifyActiveShadow;
+        QColor shadowColor;
         GLTexture* mShadowTexture;
 
         struct ShadowData
--- trunk/KDE/kdebase/workspace/kwin/effects/shadow_config.cpp #784968:784969
@@ -25,6 +25,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kconfiggroup.h>
+#include <kcolorbutton.h>
+#include <kcolorscheme.h>
 
 #include <QWidget>
 #include <QGridLayout>
@@ -36,6 +38,12 @@
 KWIN_EFFECT_CONFIG_FACTORY
 #endif
 
+// Save some typing
+static QColor schemeShadowColor()
+{
+    return KColorScheme::shade(Qt::white, KColorScheme::ShadowShade);
+}
+
 namespace KWin
 {
 
@@ -77,9 +85,15 @@
     connect(mShadowSize, SIGNAL(valueChanged(int)), this, SLOT(changed()));
     layout->addWidget(mShadowSize, 4, 1);
 
+    layout->addWidget(new QLabel(i18n("Shadow color:"), this), 5, 0);
+    mShadowColor = new KColorButton(this);
+    mShadowColor->setDefaultColor(schemeShadowColor());
+    connect(mShadowColor, SIGNAL(changed(QColor)), this, SLOT(changed()));
+    layout->addWidget(mShadowColor, 5, 1);
+
     mIntensifyActiveShadow = new QCheckBox(i18n("Active window has stronger \
                shadow"), this);
     connect(mIntensifyActiveShadow, SIGNAL(toggled(bool)), this, SLOT(changed()));
-    layout->addWidget(mIntensifyActiveShadow, 5, 0, 1, 2);
+    layout->addWidget(mIntensifyActiveShadow, 6, 0, 1, 2);
 
     layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, \
QSizePolicy::Expanding), 6, 0, 1, 2);  
@@ -102,6 +116,7 @@
     mShadowOpacity->setValue( (int)( conf.readEntry( "Opacity", 0.25 ) * 100 ) );
     mShadowFuzzyness->setValue( conf.readEntry( "Fuzzyness", 10 ) );
     mShadowSize->setValue( conf.readEntry( "Size", 5 ) );
+    mShadowColor->setColor( conf.readEntry( "Color", schemeShadowColor() ) );
     mIntensifyActiveShadow->setChecked( conf.readEntry( "IntensifyActiveShadow", \
true ) );  
     emit changed(false);
@@ -118,6 +133,14 @@
     conf.writeEntry( "Opacity", mShadowOpacity->value() / 100.0 );
     conf.writeEntry( "Fuzzyness", mShadowFuzzyness->value() );
     conf.writeEntry( "Size", mShadowSize->value() );
+    QColor userColor = mShadowColor->color();
+    if (userColor == schemeShadowColor()) {
+        // If the user has reset the color to the default we want to start
+        // picking up color scheme changes again in the shadow effect
+        conf.deleteEntry( "Color" );
+    } else {
+        conf.writeEntry( "Color", userColor );
+    }
     conf.writeEntry( "IntensifyActiveShadow", mIntensifyActiveShadow->isChecked() );
     conf.sync();
 
@@ -134,6 +157,7 @@
     mShadowFuzzyness->setValue( 10 );
     mShadowSize->setValue( 5 );
     mIntensifyActiveShadow->setChecked( true );
+    mShadowColor->setColor( schemeShadowColor() );
     emit changed(true);
     }
 
--- trunk/KDE/kdebase/workspace/kwin/effects/shadow_config.h #784968:784969
@@ -27,6 +27,7 @@
 
 class QSpinBox;
 class QCheckBox;
+class KColorButton;
 
 namespace KWin
 {
@@ -48,6 +49,7 @@
         QSpinBox* mShadowOpacity;
         QSpinBox* mShadowFuzzyness;
         QSpinBox* mShadowSize;
+        KColorButton* mShadowColor;
         QCheckBox* mIntensifyActiveShadow;
     };
 


[prev in list] [next in list] [prev in thread] [next in thread]