From c5c7cd79d6be0d4941453dd5791b9fcb87bca9d6 Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Thu, 17 Sep 2009 05:07:43 +0000
Subject: [PATCH] used OxygenShadowConfigration rather than shadowTileOption to
 detect if shadowTiles are to be recreated, because the latter was both
 incomplete and redundant with the former.

svn path=/trunk/KDE/kdebase/workspace/; revision=1024657
---
 clients/oxygen/oxygenclient.cpp | 17 ++++++++---------
 clients/oxygen/oxygenclient.h   | 32 +++-----------------------------
 2 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index d76483b488..0eaaa7961a 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -75,6 +75,8 @@ namespace Oxygen
     KCommonDecorationUnstable(b, f),
     colorCacheInvalid_(true),
     sizeGrip_( 0 ),
+    inactiveShadowConfiguration_( QPalette::Inactive ),
+    activeShadowConfiguration_( QPalette::Active ),
     inactiveShadowTiles_( 0 ),
     activeShadowTiles_( 0 ),
     helper_(*globalHelper),
@@ -830,15 +832,12 @@ namespace Oxygen
 
     OxygenShadowConfiguration shadowConfiguration( OxygenFactory::shadowConfiguration( active && useOxygenShadows() ) );
 
-    ShadowTilesOption opt;
-    opt.active      = active;
-    opt.width       = shadowConfiguration.shadowSize();
-    opt.windowColor = color;
-    opt.innerColor   = shadowConfiguration.innerColor();
+    OxygenShadowConfiguration local( shadowConfiguration );
+    local.setShadowSize( OxygenFactory::shadowSize() );
 
-    ShadowTilesOption currentOpt = active ? activeShadowTilesOption_:inactiveShadowTilesOption_;
+    OxygenShadowConfiguration current = active ? activeShadowConfiguration_:inactiveShadowConfiguration_;
 
-    bool optionChanged = !(currentOpt == opt );
+    bool optionChanged = !(current == local );
     if (active && activeShadowTiles_ )
     {
 
@@ -897,12 +896,12 @@ namespace Oxygen
     if( active )
     {
 
-      activeShadowTilesOption_ = opt;
+      activeShadowConfiguration_ = local;
       activeShadowTiles_ = tileSet;
 
     } else {
 
-      inactiveShadowTilesOption_ = opt;
+      inactiveShadowConfiguration_ = local;
       inactiveShadowTiles_ = tileSet;
 
     }
diff --git a/clients/oxygen/oxygenclient.h b/clients/oxygen/oxygenclient.h
index dbaaa719e7..94057d757f 100644
--- a/clients/oxygen/oxygenclient.h
+++ b/clients/oxygen/oxygenclient.h
@@ -30,8 +30,8 @@
 
 #include <kcommondecoration.h>
 
-#include "kdeversion.h"
 #include "oxygenconfiguration.h"
+#include "oxygenshadowconfiguration.h"
 #include "lib/helper.h"
 #include "lib/tileset.h"
 
@@ -128,32 +128,6 @@ namespace Oxygen
 
         private:
 
-        class ShadowTilesOption {
-
-          public:
-
-          //! constructor
-          ShadowTilesOption( void ):
-            width(0),
-            active(false)
-          {}
-
-          //! equal to operator
-          bool operator == ( const ShadowTilesOption& other ) const
-          {
-            return
-              windowColor == other.windowColor &&
-              innerColor == other.innerColor &&
-              width == other.width &&
-              active == other.active;
-          }
-
-          QColor windowColor;
-          QColor innerColor;
-          qreal width;
-          bool active;
-        };
-
         //! calculate mask
         QRegion calcMask( void ) const;
 
@@ -191,8 +165,8 @@ namespace Oxygen
         //! size grip widget
         OxygenSizeGrip* sizeGrip_;
 
-        ShadowTilesOption inactiveShadowTilesOption_;
-        ShadowTilesOption activeShadowTilesOption_;
+        OxygenShadowConfiguration inactiveShadowConfiguration_;
+        OxygenShadowConfiguration activeShadowConfiguration_;
         TileSet *inactiveShadowTiles_;
         TileSet *activeShadowTiles_;