From 2afbdf1228c602d7301754a4c60ca2be0554ea6f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 1 Nov 2019 21:49:53 +0100 Subject: [PATCH] Ref T747, disable "stay on top" if window is send to back --- src/blackgui/guiapplication.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 0be2eadd9..ead148e24 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -1188,7 +1188,9 @@ namespace BlackGui if (this->isShuttingDown()) { return; } m_frontBack = false; QMainWindow *w = this->mainApplicationWindow(); - if (!w) { return; } + if (!w) { return; } + if (CGuiUtility::staysOnTop(w)) { CGuiUtility::stayOnTop(false, w); } + w->lower(); } @@ -1197,8 +1199,10 @@ namespace BlackGui if (this->isShuttingDown()) { return; } QMainWindow *w = sGui->mainApplicationWindow(); if (!w) { return; } - if (w->isMinimized()) { this->windowToFront(); return; } - if (w->isMaximized()) { this->windowToBack(); return; } + if (w->isMinimized()) { this->windowToFront(); return; } + if (w->isMaximized()) { this->windowToBack(); return; } + if (CGuiUtility::staysOnTop(w)) { this->windowToBack(); return; } + if (m_frontBack) { this->windowToBack();