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

IconItem: Schedule pixmap update when window changes

Browse Source 
QQuickItem::polish is not called when window changes.

Regression from 344d04e230

REVIEW: 127342
This commit is contained in:
David Rosca 2016-03-12 13:01:07 +01:00
parent 46a1181587
commit fd46322300
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autotests/iconitemtest.cpp
View File

@ -410,5 +410,23 @@ void IconItemTest::animatingEnabledChange()
QVERIFY(img1 != img2); // animation is running QVERIFY(img1 != img2); // animation is running
} }
void IconItemTest::windowChanged()
{
QQuickItem *item = createIconItem();
item->setProperty("animated", false);
item->setProperty("source", "tst-plasma-framework-test-icon");
QImage img = grabImage(item);
QQuickView newView;
newView.setSource(QUrl::fromLocalFile(QFINDTESTDATA("data/view.qml")));
newView.show();
QTest::qWaitForWindowExposed(&newView);
item->setProperty("visible", false);
item->setParentItem(newView.rootObject());
item->setProperty("visible", true);
QCOMPARE(grabImage(item), img);
}
QTEST_MAIN(IconItemTest) QTEST_MAIN(IconItemTest)

1
autotests/iconitemtest.h
View File

@ -52,6 +52,7 @@ private Q_SLOTS:
void changeColorGroup(); void changeColorGroup();
void animatingActiveChange(); void animatingActiveChange();
void animatingEnabledChange(); void animatingEnabledChange();
void windowChanged();
private: private:
QQuickItem *createIconItem(); QQuickItem *createIconItem();

3
src/declarativeimports/core/iconitem.cpp
View File

@ -69,6 +69,9 @@ IconItem::IconItem(QQuickItem *parent)
connect(this, &QQuickItem::enabledChanged, connect(this, &QQuickItem::enabledChanged,
this, &IconItem::enabledChanged); this, &IconItem::enabledChanged);
connect(this, &QQuickItem::windowChanged,
this, &IconItem::schedulePixmapUpdate);
//initialize implicit size to the Dialog size //initialize implicit size to the Dialog size
setImplicitWidth(KIconLoader::global()->currentSize(KIconLoader::Dialog)); setImplicitWidth(KIconLoader::global()->currentSize(KIconLoader::Dialog));
setImplicitHeight(KIconLoader::global()->currentSize(KIconLoader::Dialog)); setImplicitHeight(KIconLoader::global()->currentSize(KIconLoader::Dialog));