Revert "Revert "Revert "Revert "Do not draw background or line in too…

…lbars if the color scheme has no headers group"""" This reverts commit ef234ac. CCMAIL: [email protected] CCMAIL: [email protected] This commit was inappropriately reverted with no discussion for the second time, ignoring the comment recommending against it in https://invent.kde.org/plasma/breeze/-/merge_requests/82#note_190308. This is a community project and you are not the maintainer. Please do not revert this again, and also stop reverting changes you disapprove of without discussion. This is an inappropruate use of your commit rights and may result in their revocation if you keep doing it. Further offenses will be reported to the CWG.
paulmcauley · Feb 23, 2021 · 9c21c8b · 9c21c8b
1 parent 925d4b4
commit 9c21c8b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
@@ -950,7 +950,7 @@ namespace Breeze
     bool Style::drawWidgetPrimitive( const QStyleOption* option, QPainter* painter, const QWidget* widget ) const {
         Q_UNUSED(option)
         auto parent = widget;
-        if (!_helper->shouldDrawToolsArea(widget)) {
+        if (!_toolsAreaManager->hasHeaderColors() || !_helper->shouldDrawToolsArea(widget)) {
             return true;
         }
         auto mw = qobject_cast<const QMainWindow*>(widget);

diff --git a/kstyle/breezetoolsareamanager.cpp b/kstyle/breezetoolsareamanager.cpp
@@ -121,6 +121,8 @@ namespace Breeze {
                 }
             }
         }
+
+        _colorSchemeHasHeaderColor =  KColorScheme::isColorSetSupported(_config, KColorScheme::Header);
     }
 
     bool AppListener::eventFilter(QObject *watched, QEvent *event)
@@ -239,4 +241,9 @@ namespace Breeze {
             _windows[mainWindow].removeAll(toolbar);
         }
     }
+
+    bool Breeze::ToolsAreaManager::hasHeaderColors()
+    {
+        return _colorSchemeHasHeaderColor;
+    }
 }
diff --git a/kstyle/breezetoolsareamanager.h b/kstyle/breezetoolsareamanager.h
@@ -37,6 +37,7 @@ namespace Breeze {
         KConfigWatcher::Ptr _watcher;
         QPalette _palette = QPalette();
         AppListener* _listener;
+        bool _colorSchemeHasHeaderColor;
 
         friend class AppListener;
 
@@ -58,6 +59,8 @@ namespace Breeze {
         void unregisterWidget(QWidget *widget);
 
         QRect toolsAreaRect(const QMainWindow *window);
+
+        bool hasHeaderColors();
     };
 }