yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove hard coded colors

Browse source
This commit is contained in:
Antonis Tsiapaliokas 2013-09-13 13:34:40 +03:00 committed by Martin Gräßlin
parent bd3219b5a7
commit d5a6dff6dd
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kcmkwin/kwincompositing/model.h
View file

@ -21,6 +21,9 @@
#ifndef MODEL_H
#define MODEL_H
#include <KDE/KColorScheme>
#include <KDE/KSharedConfig>
#include <QAbstractItemModel>
#include <QHash>
#include <QList>
@ -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);

2
kcmkwin/kwincompositing/qml/Effect.qml
View file

@ -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 {

3
kcmkwin/kwincompositing/qml/EffectView.qml
View file

@ -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