Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into closerequest

Browse Source 
# Conflicts:
#	demo/MainWindow.cpp
This commit is contained in:
Uwe Kindler
2020-01-12 15:07:51 +01:00
parent a5e8011222 ea03b988e0
commit 4c928071af
10 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/FloatingDockContainer.cpp
View File

@@ -354,6 +354,7 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event)
{
ADS_PRINT("CFloatingDockContainer closeEvent");
d->setState(DraggingInactive);
event->ignore();
if (isClosable())
{
@@ -380,20 +381,7 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event)
// Starting from Qt version 5.12.2 this seems to work again. But
// now the QEvent::NonClientAreaMouseButtonPress function returns always
// Qt::RightButton even if the left button was pressed
#ifndef Q_OS_LINUX
#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 2) && QT_VERSION < QT_VERSION_CHECK(5, 12, 2))
event->ignore();
this->hide();
#else
Super::closeEvent(event);
#endif
#else // Q_OS_LINUX
Super::closeEvent(event);
#endif
}
else
{
event->ignore();
}
}