From 622cef5b88ea7ff457c749831ec7a22d5d97875d Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Mon, 22 Oct 2007 17:30:53 +0000 Subject: [PATCH] use NegativeBackground instead of yellow for alerts, don't change the foreground (not necessary, would break with some color schemes) svn path=/trunk/KDE/kdebase/apps/; revision=728201 --- src/statusbarmessagelabel.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index d734a5e0c0..7099374fcc 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -21,7 +21,6 @@ #include "statusbarmessagelabel.h" #include -#include #include #include #include @@ -141,17 +140,17 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */) QPainter painter(this); // draw background - QColor backgroundColor = palette().brush(QPalette::Background).color(); - QColor foregroundColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color(); + QColor backgroundColor = palette().window().color(); if (m_illumination > 0) { - // TODO: are there foreground and background colors available for - // "error messages"? - backgroundColor.setRgb(255, 255, 0, m_illumination); - QColor mixColor(0, 0, 0, m_illumination); - foregroundColor = KColorUtils::overlayColors(foregroundColor, mixColor); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); +// QColor blendColor = scheme.background(KColorScheme::NegativeBackground).color(); +// backgroundColor = scheme.background().color(); // FIXME shouldn't be needed but I'm getting black otherwise?? +// backgroundColor = KColorUtils::mix(backgroundColor, blendColor, double(m_illumination) / 128.0); + backgroundColor = scheme.background(KColorScheme::NegativeBackground).color(); + backgroundColor.setAlpha(qMin(255, m_illumination*2)); } painter.setBrush(backgroundColor); - painter.setPen(backgroundColor); + painter.setPen(Qt::NoPen); painter.drawRect(QRect(0, 0, width(), height())); // draw pixmap @@ -164,7 +163,7 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */) } // draw text - painter.setPen(foregroundColor); + painter.setPen(palette().windowText().color()); int flags = Qt::AlignVCenter; if (height() > m_minTextHeight) { flags = flags | Qt::TextWordWrap;