From d5a6dff6dd51a3403632cccafa50f3e759d597a0 Mon Sep 17 00:00:00 2001 From: Antonis Tsiapaliokas Date: Fri, 13 Sep 2013 13:34:40 +0300 Subject: [PATCH] Remove hard coded colors --- kcmkwin/kwincompositing/model.h | 10 ++++++++++ kcmkwin/kwincompositing/qml/Effect.qml | 2 +- kcmkwin/kwincompositing/qml/EffectView.qml | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h index 1447459cef..482a7caa83 100644 --- a/kcmkwin/kwincompositing/model.h +++ b/kcmkwin/kwincompositing/model.h @@ -21,6 +21,9 @@ #ifndef MODEL_H #define MODEL_H + +#include +#include #include #include #include @@ -104,6 +107,9 @@ class EffectFilterModel : public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged) + Q_PROPERTY(QColor backgroundActiveColor READ backgroundActiveColor CONSTANT); + Q_PROPERTY(QColor backgroundNormalColor READ backgroundNormalColor CONSTANT); + Q_PROPERTY(QColor backgroundAlternateColor READ backgroundAlternateColor CONSTANT); public: EffectFilterModel(QObject *parent = 0); const QString &filter() const; @@ -112,6 +118,10 @@ public: Q_INVOKABLE void syncConfig(); Q_INVOKABLE void enableWidnowManagement(bool enabled); + QColor backgroundActiveColor() { return KColorScheme(QPalette::Active, KColorScheme::Selection, KSharedConfigPtr(0)).background(KColorScheme::LinkBackground).color(); }; + QColor backgroundNormalColor() { return KColorScheme(QPalette::Active, KColorScheme::View, KSharedConfigPtr(0)).background(KColorScheme::NormalBackground).color(); }; + QColor backgroundAlternateColor() { return KColorScheme(QPalette::Active, KColorScheme::View, KSharedConfigPtr(0)).background(KColorScheme::AlternateBackground).color(); }; + public Q_SLOTS: void setFilter(const QString &filter); diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml index bc4a0ab7f6..096d19d345 100644 --- a/kcmkwin/kwincompositing/qml/Effect.qml +++ b/kcmkwin/kwincompositing/qml/Effect.qml @@ -33,7 +33,7 @@ Component { Rectangle { id: background - color: item.ListView.isCurrentItem ? "#448" : index % 2 ? "#eee" : "#fff" + color: item.ListView.isCurrentItem ? effectView.backgroundActiveColor : index % 2 ? effectView.backgroundNormalColor : effectView.backgroundAlternateColor anchors.fill : parent RowLayout { diff --git a/kcmkwin/kwincompositing/qml/EffectView.qml b/kcmkwin/kwincompositing/qml/EffectView.qml index ac19b62f3a..d2912766ff 100644 --- a/kcmkwin/kwincompositing/qml/EffectView.qml +++ b/kcmkwin/kwincompositing/qml/EffectView.qml @@ -253,6 +253,9 @@ Item { } ListView { id: effectView + property color backgroundActiveColor: searchModel.backgroundActiveColor + property color backgroundNormalColor: searchModel.backgroundNormalColor + property color backgroundAlternateColor: searchModel.backgroundAlternateColor Layout.fillWidth: true anchors.fill: parent model: searchModel