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

Set visibility on mainItem to match Dialog

Browse Source 
Otherwise we can have an invisible dialog in which the items think they
are visible.

QtQuick is smart enough to not redraw anything if the window isn't
visible, but a lot of bits of our code check the visibility flag to
enable/disable animations. These animation timers do still trigger when
the window isn't visible which wastes CPU cycles.

We are already meddling with the visibility flag so this shouldn't have
too much impact.

Change-Id: I92b969e60b4fdbe4ff2c70f9cce6e3408482a862
This commit is contained in:
David Edmundson 2014-12-28 20:37:04 +01:00
parent 8a68da469c
commit 7d545e22f1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasmaquick/dialog.cpp
View File

@ -237,6 +237,10 @@ void DialogPrivate::updateTheme()
void DialogPrivate::updateVisibility(bool visible) void DialogPrivate::updateVisibility(bool visible)
{ {
if (mainItem) {
mainItem->setVisible(visible);
}
if (visible) { if (visible) {
if (visualParent && visualParent->window()) { if (visualParent && visualParent->window()) {
q->setTransientParent(visualParent->window()); q->setTransientParent(visualParent->window());
@ -269,6 +273,7 @@ void DialogPrivate::updateVisibility(bool visible)
} }
} }
if (!(q->flags() & Qt::ToolTip)) { if (!(q->flags() & Qt::ToolTip)) {
KWindowEffects::SlideFromLocation slideLocation = KWindowEffects::NoEdge; KWindowEffects::SlideFromLocation slideLocation = KWindowEffects::NoEdge;
@ -675,7 +680,7 @@ void Dialog::setMainItem(QQuickItem *mainItem)
d->mainItem = mainItem; d->mainItem = mainItem;
if (mainItem) { if (mainItem) {
d->mainItem->setVisible(true); d->mainItem->setVisible(isVisible());
mainItem->setParentItem(contentItem()); mainItem->setParentItem(contentItem());
connect(mainItem, SIGNAL(widthChanged()), this, SLOT(slotMainItemSizeChanged())); connect(mainItem, SIGNAL(widthChanged()), this, SLOT(slotMainItemSizeChanged()));