From 199c7f2ffeafd5081f86f53373ec09fea6c11617 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 23 May 2014 14:31:11 +0200 Subject: [PATCH] Don't change visibility mode on panel when opening config There's a timer on the struts updating, and so far this all seems to work quite well. BUG: 333876 --- shell/panelconfigview.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp index 2da9c3f91..b3bf59895 100644 --- a/shell/panelconfigview.cpp +++ b/shell/panelconfigview.cpp @@ -49,7 +49,6 @@ 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) { @@ -75,7 +74,6 @@ PanelConfigView::PanelConfigView(Plasma::Containment *containment, PanelView *pa PanelConfigView::~PanelConfigView() { - m_panelView->setVisibilityMode(m_visibilityMode); PanelShadows::self()->removeWindow(this); } @@ -147,7 +145,6 @@ void PanelConfigView::showEvent(QShowEvent *ev) } m_deleteTimer.stop(); - m_panelView->setVisibilityMode(PanelView::WindowsGoBelow); PanelShadows::self()->addWindow(this); } @@ -155,7 +152,6 @@ void PanelConfigView::hideEvent(QHideEvent *ev) { QQuickWindow::hideEvent(ev); m_deleteTimer.start(); - m_panelView->setVisibilityMode(m_visibilityMode); if (m_containment) { m_containment->setUserConfiguring(false); @@ -174,6 +170,8 @@ void PanelConfigView::setVisibilityMode(PanelView::VisibilityMode mode) return; } + m_panelView->setVisibilityMode(mode); + m_visibilityMode = mode; emit visibilityModeChanged(); }