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

List:       kde-commits
Subject:    [breeze/Plasma/5.5] kstyle: Check whether parent has altered background to decide of tabbar's backgr
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2016-01-11 19:21:10
Message-ID: E1aIi1e-00081E-83 () scm ! kde ! org
[Download RAW message or body]

Git commit f422975c719f0a57ac6d28c28fbe39c2b8e80cee by Hugo Pereira Da Costa.
Committed on 11/01/2016 at 19:20.
Pushed by hpereiradacosta into branch 'Plasma/5.5'.

Check whether parent has altered background to decide of tabbar's background in \
document mode.

Conflicts:
	kstyle/breezestyle.cpp

M  +1    -1    kstyle/breezestyle.cpp

http://commits.kde.org/breeze/f422975c719f0a57ac6d28c28fbe39c2b8e80cee

diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index 98bb387..ad2d1c5 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -5428,7 +5428,7 @@ namespace Breeze
             const QTabWidget *tabWidget = ( widget && widget->parentWidget() ) ? \
                qobject_cast<const QTabWidget *>( widget->parentWidget() ) : nullptr;
             documentMode |= ( tabWidget ? tabWidget->documentMode() : true );
 
-            color = documentMode ? palette.color( QPalette::Window ) : \
_helper->frameBackgroundColor( palette ); +            color = \
(documentMode&&!hasAlteredBackground(widget)) ? palette.color( QPalette::Window ) : \
_helper->frameBackgroundColor( palette );  
         } else {
 


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