Commit 9b9eab95 authored by Matthew Woehlke's avatar Matthew Woehlke
Browse files

ColorScheme.cpp: don't use deprecated KColorScheme ctor; need to decide how...

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
parent 66f72518
...@@ -382,7 +382,7 @@ AccessibleColorScheme::AccessibleColorScheme() ...@@ -382,7 +382,7 @@ AccessibleColorScheme::AccessibleColorScheme()
// setup colors // setup colors
const int ColorRoleCount = 8; const int ColorRoleCount = 8;
const KColorScheme colorScheme; const KColorScheme colorScheme(QPalette::Active);
QBrush colors[ColorRoleCount] = QBrush colors[ColorRoleCount] =
{ {
......
...@@ -648,10 +648,11 @@ void TabbedViewContainerV2::removeViewWidget( QWidget* view ) ...@@ -648,10 +648,11 @@ void TabbedViewContainerV2::removeViewWidget( QWidget* view )
void TabbedViewContainerV2::setTabActivity(int index , bool activity) 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 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); const QColor activityColor = KColorUtils::mix(normalColor,colorSchemeActive);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment