Merge "Set visibility on mainItem to match Dialog"
This commit is contained in:
commit
0f5e9b1a5d
@ -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()));
|
||||||
|
Loading…
Reference in New Issue
Block a user