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

Merge branch 'Plasma/5.4'

Browse source
This commit is contained in:
Martin Gräßlin 2015-10-21 16:47:01 +02:00
commit 3eb52eb6ed
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kcmkwin/kwincompositing/model.cpp
View file

@ -609,8 +609,9 @@ void EffectView::init(ViewType type)
}
QString mainFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, path, QStandardPaths::LocateFile);
setResizeMode(QQuickView::SizeRootObjectToView);
rootContext()->setContextProperty("engine", this);
setSource(QUrl(mainFile));
rootObject()->setProperty("color",
KColorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)).background(KColorScheme::NormalBackground).color());
connect(rootObject(), SIGNAL(changed()), this, SIGNAL(changed()));
setMinimumSize(initialSize());
connect(rootObject(), SIGNAL(implicitWidthChanged()), this, SLOT(slotImplicitSizeChanged()));

2
kcmkwin/kwincompositing/model.h
View file

@ -126,8 +126,6 @@ public:
};
EffectView(ViewType type, QWindow *parent = 0);
Q_INVOKABLE QColor backgroundViewColor() { return KColorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)).background(KColorScheme::NormalBackground).color(); };
void save();
void load();
void defaults();

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

@ -27,7 +27,6 @@ Rectangle {
signal changed
implicitWidth: col.implicitWidth
implicitHeight: col.implicitHeight
color: engine.backgroundViewColor()
Component {
id: sectionHeading