From acd904bd58f84c1fe6a9978fee40f1c48ea3b148 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 29 May 2014 19:22:01 +0200 Subject: [PATCH] Revert "Don't change visibility mode on panel when opening config" This reverts commit 199c7f2ffeafd5081f86f53373ec09fea6c11617. --- shell/panelconfigview.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp index b3bf59895..2da9c3f91 100644 --- a/shell/panelconfigview.cpp +++ b/shell/panelconfigview.cpp @@ -49,6 +49,7 @@ PanelConfigView::PanelConfigView(Plasma::Containment *containment, PanelView *pa connect(&m_deleteTimer, &QTimer::timeout, this, &PanelConfigView::deleteLater); m_visibilityMode = panelView->visibilityMode(); + panelView->setVisibilityMode(PanelView::WindowsGoBelow); setScreen(panelView->screen()); connect(panelView, &QWindow::screenChanged, this, [=](QScreen *screen) { @@ -74,6 +75,7 @@ PanelConfigView::PanelConfigView(Plasma::Containment *containment, PanelView *pa PanelConfigView::~PanelConfigView() { + m_panelView->setVisibilityMode(m_visibilityMode); PanelShadows::self()->removeWindow(this); } @@ -145,6 +147,7 @@ void PanelConfigView::showEvent(QShowEvent *ev) } m_deleteTimer.stop(); + m_panelView->setVisibilityMode(PanelView::WindowsGoBelow); PanelShadows::self()->addWindow(this); } @@ -152,6 +155,7 @@ void PanelConfigView::hideEvent(QHideEvent *ev) { QQuickWindow::hideEvent(ev); m_deleteTimer.start(); + m_panelView->setVisibilityMode(m_visibilityMode); if (m_containment) { m_containment->setUserConfiguring(false); @@ -170,8 +174,6 @@ void PanelConfigView::setVisibilityMode(PanelView::VisibilityMode mode) return; } - m_panelView->setVisibilityMode(mode); - m_visibilityMode = mode; emit visibilityModeChanged(); }