From 9b9eab95e1bf558eacdd41c252cca166d81e5481 Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Thu, 6 Sep 2007 21:49:11 +0000 Subject: [PATCH] ColorScheme.cpp: don't use deprecated KColorScheme ctor; need to decide how Konsole wants to handle state effects ViewContainer.cpp: use new KColorScheme ctor, correctly svn path=/trunk/KDE/kdebase/apps/konsole/; revision=709227 --- src/ColorScheme.cpp | 2 +- src/ViewContainer.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp index aae3352f0..62e1721b8 100644 --- a/src/ColorScheme.cpp +++ b/src/ColorScheme.cpp @@ -382,7 +382,7 @@ AccessibleColorScheme::AccessibleColorScheme() // setup colors const int ColorRoleCount = 8; - const KColorScheme colorScheme; + const KColorScheme colorScheme(QPalette::Active); QBrush colors[ColorRoleCount] = { diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp index a92034b00..f881c9e7a 100644 --- a/src/ViewContainer.cpp +++ b/src/ViewContainer.cpp @@ -648,10 +648,11 @@ void TabbedViewContainerV2::removeViewWidget( QWidget* view ) void TabbedViewContainerV2::setTabActivity(int index , bool activity) { - KColorScheme colorScheme; + const QPalette& palette = _tabBar->palette(); + KColorScheme colorScheme(palette.currentColorGroup()); const QColor colorSchemeActive = colorScheme.foreground(KColorScheme::ActiveText).color(); - const QColor normalColor = _tabBar->palette().text().color(); + const QColor normalColor = palette.text().color(); const QColor activityColor = KColorUtils::mix(normalColor,colorSchemeActive);