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

attached properties have parent, not parentItem

Browse Source 
attached properties never, ever are in a scene
even if they are qquickitems it may cause big rendering
problems
This commit is contained in:
Marco Martin 2016-01-14 15:11:16 +01:00
parent 7a3499dd70
commit 225efd7e71
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,9 +34,10 @@ ColorScope::ColorScope(QQuickItem *parent, QObject *parentObject)
{
connect(&m_theme, &Plasma::Theme::themeChanged, this, &ColorScope::colorsChanged);
if (parent) {
connect(parent, &QQuickItem::parentChanged, this, &ColorScope::colorGroupChanged);
connect(parent, &QQuickItem::parentChanged, this, &ColorScope::colorsChanged);
QQuickItem *parentItem = qobject_cast<QQuickItem *>(parentObject);
if (parentItem) {
connect(parentItem, &QQuickItem::parentChanged, this, &ColorScope::colorGroupChanged);
connect(parentItem, &QQuickItem::parentChanged, this, &ColorScope::colorsChanged);
}
}
@ -47,18 +48,15 @@ ColorScope::~ColorScope()
ColorScope *ColorScope::qmlAttachedProperties(QObject *object)
{
QQuickItem *qp = qobject_cast<QQuickItem *>(object);
if (ColorScope::s_attachedScopes.contains(object)) {
return s_attachedScopes.value(object);
}
ColorScope *s = new ColorScope(qp, object);
ColorScope *s = new ColorScope(0, object);
s_attachedScopes[object] = s;
if (!qp) {
s->setParent(object);
}
s->setParent(object);
s->m_inherit = true;
return s;
}
@ -180,14 +178,5 @@ void ColorScope::itemChange(ItemChange change, const ItemChangeData &value)
QQuickItem::itemChange(change, value);
}
bool ColorScope::event(QEvent *event)
{
if (event->type() == QEvent::ParentChange) {
emit colorGroupChanged();
emit colorsChanged();
}
return QQuickItem::event(event);
}
#include "moc_colorscope.cpp"

3
src/declarativeimports/core/colorscope.h
View File

@ -79,9 +79,6 @@ public:
ColorScope *findParentScope() const;
void itemChange(ItemChange change, const ItemChangeData &value);
protected:
bool event(QEvent *event);
Q_SIGNALS:
void colorGroupChanged();
void colorsChanged();