From 220d0d522dd3aca740c4c2d0c1f91f277f2405fd Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 13 Aug 2012 18:40:43 +0200 Subject: Fix wrong text color in places and in folders panel. FIXED-IN: 4.9.1 REVIEW: 105832 BUG: 303133 --- src/kitemviews/kstandarditemlistwidget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/kitemviews/kstandarditemlistwidget.cpp') diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 5b0a0b741..d41b9161b 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -464,6 +464,11 @@ QFont KStandardItemListWidget::customizedFont(const QFont& baseFont) const return baseFont; } +QPalette::ColorRole KStandardItemListWidget::normalTextColorPalette() const +{ + return QPalette::Text; +} + void KStandardItemListWidget::setTextColor(const QColor& color) { if (color != m_customTextColor) { @@ -480,7 +485,7 @@ QColor KStandardItemListWidget::textColor() const } const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive; - const QPalette::ColorRole role = isSelected() ? QPalette::HighlightedText : QPalette::Text; + const QPalette::ColorRole role = isSelected() ? QPalette::HighlightedText : normalTextColorPalette(); return styleOption().palette.brush(group, role).color(); } @@ -1037,7 +1042,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() const QString elidedText = m_customizedFontMetrics.elidedText(text, Qt::ElideRight, maxWidth); textInfo->staticText.setText(elidedText); requiredWidth = m_customizedFontMetrics.width(elidedText); - } else if (role == "rating") { + } else if (role == "rating") { // Use the width of the rating pixmap, because the rating text is empty. requiredWidth = m_rating.width(); } -- cgit v1.3