From 41d3887d135948a819b64d093a49dd7b081b9091 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Fri, 4 Sep 2009 19:59:21 +0000 Subject: [PATCH] disable drawSeparator when title outline is selected svn path=/trunk/KDE/kdebase/workspace/; revision=1019931 --- clients/nitrogen/nitrogenbutton.cpp | 2 +- clients/nitrogen/nitrogenclient.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/clients/nitrogen/nitrogenbutton.cpp b/clients/nitrogen/nitrogenbutton.cpp index 8e994d475b..89bd124bbf 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() ) + if(client_.isActive() && client_.configuration().drawSeparator() && !client_.configuration().drawTitleOutline() ) { helper_.drawSeparator(&painter, QRect(x, titleHeight-1.5, w, 2), color, Qt::Horizontal); } if (type_ == ButtonMenu) diff --git a/clients/nitrogen/nitrogenclient.cpp b/clients/nitrogen/nitrogenclient.cpp index 2267775b99..dc9d8330e4 100644 --- a/clients/nitrogen/nitrogenclient.cpp +++ b/clients/nitrogen/nitrogenclient.cpp @@ -747,8 +747,7 @@ namespace Nitrogen frame.getRect(&x, &y, &w, &h); // separator - //if( isActive() && configuration().drawSeparator() && !configuration().drawTitleOutline() ) - if( isActive() && configuration().drawSeparator() ) + if( isActive() && configuration().drawSeparator() && !configuration().drawTitleOutline() ) { helper().drawSeparator(&painter, QRect(x, titleTop+titleHeight-1.5, w, 2), color, Qt::Horizontal); } // draw stripes as indicator for active windows