[rkward] rkward/windows: Don't switch to another mdi window, when a dialog is active.

Thomas Friedrichsmeier thomas.friedrichsmeier at ruhr-uni-bochum.de
Mon Jun 27 08:13:37 UTC 2016


Git commit dc2b3e508a2b4f7cce77ceaa42239a3e96440840 by Thomas Friedrichsmeier.
Committed on 24/06/2016 at 06:47.
Pushed by tfry into branch 'master'.

Don't switch to another mdi window, when a dialog is active.

M  +3    -1    rkward/windows/rkworkplace.cpp

http://commits.kde.org/rkward/dc2b3e508a2b4f7cce77ceaa42239a3e96440840

diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
index f16f8a0..5ff88f2 100644
--- a/rkward/windows/rkworkplace.cpp
+++ b/rkward/windows/rkworkplace.cpp
@@ -631,7 +631,9 @@ void RKWorkplace::removeWindow (QObject *object) {
 void RKWorkplace::windowRemoved () {
 	RK_TRACE (APP);
 
-	if (activeWindow (RKMDIWindow::AnyWindowState) != 0) return;	// something already active
+	if (activeWindow (RKMDIWindow::AnyWindowState) != 0) return;	// some RKMDIWindow is already active
+	QWidget *appWin = QApplication::activeWindow ();
+	if (appWin && appWin != RKWardMainWindow::getMain () && !qobject_cast<DetachedWindowContainer*> (appWin)) return; // a dialog window or the like is active
 
 	// try to activate an attached document window, first
 	RKMDIWindow *window = view ()->activePage ();



More information about the rkward-tracker mailing list