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

Merge "Set visibility on mainItem to match Dialog"

Browse Source
This commit is contained in:
David Edmundson 2014-12-29 15:02:24 +01:00 committed by Gerrit Code Review
commit 0f5e9b1a5d
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)
{
if (mainItem) {
mainItem->setVisible(visible);
}
if (visible) {
if (visualParent && visualParent->window()) {
q->setTransientParent(visualParent->window());
@ -269,6 +273,7 @@ void DialogPrivate::updateVisibility(bool visible)
}
}
if (!(q->flags() & Qt::ToolTip)) {
KWindowEffects::SlideFromLocation slideLocation = KWindowEffects::NoEdge;
@ -675,7 +680,7 @@ void Dialog::setMainItem(QQuickItem *mainItem)
d->mainItem = mainItem;
if (mainItem) {
d->mainItem->setVisible(true);
d->mainItem->setVisible(isVisible());
mainItem->setParentItem(contentItem());
connect(mainItem, SIGNAL(widthChanged()), this, SLOT(slotMainItemSizeChanged()));