mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 21:25:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change to ensure that modal widgets are always on top of floating widgets

Browse Source
This commit is contained in:
Uwe 2022-09-02 18:18:28 +02:00
parent d27783e2f1
commit c11a496278
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DockFocusController.cpp
View File

@ -264,7 +264,7 @@ void CDockFocusController::onFocusWindowChanged(QWindow *focusWindow)
//=========================================================================== //===========================================================================
void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidget* focusedNow) void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidget* focusedNow)
{ {
Q_UNUSED(focusedOld); Q_UNUSED(focusedOld);
if (d->DockManager->isRestoringState()) if (d->DockManager->isRestoringState())
{ {

11
src/DockManager.cpp
View File

@ -45,6 +45,7 @@
#include <QSettings> #include <QSettings>
#include <QMenu> #include <QMenu>
#include <QApplication> #include <QApplication>
#include <QWindow>
#include "FloatingDockContainer.h" #include "FloatingDockContainer.h"
#include "DockOverlay.h" #include "DockOverlay.h"
@ -500,6 +501,16 @@ CDockManager::CDockManager(QWidget *parent) :
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
window()->installEventFilter(this); window()->installEventFilter(this);
connect(qApp, &QApplication::focusWindowChanged, [](QWindow* focusWindow)
{
// bring modal dialogs to foreground to ensure that they are in front of any
// floating dock widget
if (focusWindow && focusWindow->isModal())
{
focusWindow->raise();
}
});
#endif #endif
} }