alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ColorScope] Work with plain QObjects again

Browse Source 
Otherwise colorScope doesn't attach to things like Plasma.Svg.
Also remove superfluous cast as parentItem() returns a QQuickItem *.

Differential Revision: https://phabricator.kde.org/D25887
This commit is contained in:
Kai Uwe Broulik 2019-12-11 16:02:11 +01:00
parent e44cab6ab5
commit 8f7b2c9ae0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/declarativeimports/core/colorscope.cpp
View File

@ -109,12 +109,19 @@ void ColorScope::setParentScope(ColorScope* parentScope)
ColorScope *ColorScope::findParentScope() ColorScope *ColorScope::findParentScope()
{ {
QQuickItem *candidate = qobject_cast<QQuickItem *>(parentItem()); QObject *candidate = parentItem();
if (!candidate) { if (!candidate) {
candidate = qobject_cast<QQuickItem *>(parent()); candidate = parent();
} }
while (candidate) { while (candidate) {
candidate = candidate->parentItem(); auto *quickCandidate = qobject_cast<QQuickItem *>(candidate);
if (quickCandidate && quickCandidate->parentItem()) {
candidate = quickCandidate->parentItem();
} else {
candidate = candidate->parent();
}
ColorScope *s = qobject_cast<ColorScope *>(candidate); ColorScope *s = qobject_cast<ColorScope *>(candidate);
if (!s) { if (!s) {
// Make sure AppletInterface always has a ColorScope // Make sure AppletInterface always has a ColorScope