From 3455dda8d511aeafcecc03fb0225d963709f886d Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Mon, 7 Sep 2009 17:26:56 +0000
Subject: [PATCH] used inline functions to get decisions that combine multiple
 options and window state

svn path=/trunk/KDE/kdebase/workspace/; revision=1020951
---
 clients/nitrogen/nitrogenbutton.cpp | 2 +-
 clients/nitrogen/nitrogenclient.cpp | 4 ++--
 clients/nitrogen/nitrogenclient.h   | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/clients/nitrogen/nitrogenbutton.cpp b/clients/nitrogen/nitrogenbutton.cpp
index 435262b1d8..682377fd2b 100644
--- a/clients/nitrogen/nitrogenbutton.cpp
+++ b/clients/nitrogen/nitrogenbutton.cpp
@@ -162,7 +162,7 @@ namespace Nitrogen
     
     dark.setAlpha(120);
     
-    if(client_.isActive() && client_.configuration().drawSeparator() && !client_.configuration().drawTitleOutline() ) 
+    if( client_.drawSeparator() ) 
     { helper_.drawSeparator(&painter, QRect(x, titleHeight-1.5, w, 2), color, Qt::Horizontal); }
     
     // for menu button the application icon is used
diff --git a/clients/nitrogen/nitrogenclient.cpp b/clients/nitrogen/nitrogenclient.cpp
index a58a72b182..799d3bf9de 100644
--- a/clients/nitrogen/nitrogenclient.cpp
+++ b/clients/nitrogen/nitrogenclient.cpp
@@ -745,7 +745,7 @@ namespace Nitrogen
     frame.getRect(&x, &y, &w, &h);
     
     // separator
-    if( isActive() && configuration().drawSeparator() && !configuration().drawTitleOutline() ) 
+    if( drawSeparator() ) 
     { helper().drawSeparator(&painter, QRect(x, titleTop+titleHeight-1.5, w, 2), color, Qt::Horizontal); }
     
     // shadow and resize handles
@@ -902,7 +902,7 @@ namespace Nitrogen
     p.setRenderHint( QPainter::Antialiasing );
     p.setPen( Qt::NoPen );
     
-    if( active && configuration().useOxygenShadows() )
+    if( useOxygenShadows() )
     {
       
       //---------------------------------------------------------------
diff --git a/clients/nitrogen/nitrogenclient.h b/clients/nitrogen/nitrogenclient.h
index 9fec12816b..59f0e9f3e8 100644
--- a/clients/nitrogen/nitrogenclient.h
+++ b/clients/nitrogen/nitrogenclient.h
@@ -61,6 +61,14 @@ namespace Nitrogen
         //! true if window is maximized
         virtual bool isMaximized( void ) const;
         
+        //! true when separator is to be drawn
+        virtual bool drawSeparator( void ) const
+        { return isActive() && configuration().drawSeparator() && !configuration().drawTitleOutline(); }
+       
+        //! true when oxygen 'glow' shadow is to be drawn for active window
+        virtual bool useOxygenShadows( void ) const
+        { return isActive() && configuration().useOxygenShadows(); }
+        
         //! dimensions
         virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;