diff options
Diffstat (limited to 'twin/rules.cpp')
| -rw-r--r-- | twin/rules.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/twin/rules.cpp b/twin/rules.cpp index 7bd2cd469..a72c4d195 100644 --- a/twin/rules.cpp +++ b/twin/rules.cpp @@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <tdeconfig.h> #include <tqregexp.h> #include <tdetempfile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqfile.h> #ifndef KCMRULES @@ -75,7 +75,7 @@ Rules::Rules( const TQString& str, bool temporary ) f->writeBlock( s.data(), s.length()); } file.close(); - KSimpleConfig cfg( file.name()); + TDESimpleConfig cfg( file.name()); readFromCfg( cfg ); if( description.isEmpty()) description = "temporary"; @@ -902,12 +902,16 @@ void Client::checkAndSetInitialRuledOpacity() rule_opacity_inactive = 0; return; - + if( isDock() ) //workaround for docks, as they don't have active/inactive settings and don't aut, therefore we take only the active one... { - uint tmp = rule_opacity_active ? rule_opacity_active : options->dockOpacity; - setOpacity(tmp < 0xFFFFFFFF && (rule_opacity_active || options->translucentDocks), tmp); + if (rule_opacity_active) + setOpacity(rule_opacity_active); + else if(options->translucentDocks) + setOpacity(options->dockOpacity); + else + setOpacity(Opacity::Opaque); } else updateOpacity(); |