From 15b687a27065f466f5f0469a2b653a87ca61d055 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Tue, 14 Aug 2012 22:02:24 +0200 Subject: Fix wrong text color in Places Group Header. Use QPalette::Window for base color and QPalette::WindowText for text color. Also changed m_roleColor color mixing to 60% (from 70%) -> Better visible color difference when base color is darker than text color. Also changed styleOption().palette.brush(group, role).color() to styleOption().palette.color(group, role) in KStandardItemListWidget -> should be more efficient. BUG: 303133 FIXED-IN: 4.9.1 (cherry picked from commit b3c3da985159a9627c079ad615cd77fc5f7bb72a) --- src/kitemviews/kitemlistgroupheader.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/kitemviews/kitemlistgroupheader.h') diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h index e19ab4871..1e8ed2cca 100644 --- a/src/kitemviews/kitemlistgroupheader.h +++ b/src/kitemviews/kitemlistgroupheader.h @@ -104,11 +104,17 @@ protected: /** @reimp */ virtual void resizeEvent(QGraphicsSceneResizeEvent* event); + virtual QPalette::ColorRole normalTextColorRole() const; + virtual QPalette::ColorRole normalBaseColorRole() const; + private: void updateCache(); static QColor mixedColor(const QColor& c1, const QColor& c2, int c1Percent = 50); + QColor textColor() const; + QColor baseColor() const; + private: bool m_dirtyCache; QByteArray m_role; -- cgit v1.3.1