flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T592, remember size/position where last floating

Browse Source 
This seems to work more reliable as the Qt mechanism,
but still suffers incorrect positions from time to time.

The floating window opens on to of the main widget,
which is uncritical but still strange why it happens
This commit is contained in:
Klaus Basan
2019-04-05 16:15:42 +02:00
committed by Mat Sutcliffe
parent ba33ebb1f5
commit 60b4b08da6
2 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/blackgui/dockwidget.cpp
View File

@@ -32,6 +32,8 @@
#include <QWidgetAction>
#include <QWidget>
#include <Qt>
#include <QTimer>
#include <QPointer>
#include <QtGlobal>
#include <QApplication>
#include <QDesktopWidget>
@@ -167,13 +169,13 @@ namespace BlackGui
QDockWidget::setWindowTitle(title);
}
void CDockWidget::displayStatusMessage(const BlackMisc::CStatusMessage &statusMessage)
void CDockWidget::displayStatusMessage(const CStatusMessage &statusMessage)
{
if (!m_allowStatusBar || !this->isFloating()) { return; }
m_statusBar.displayStatusMessage(statusMessage);
}
void CDockWidget::displayStatusMessages(const BlackMisc::CStatusMessageList &statusMessages)
void CDockWidget::displayStatusMessages(const CStatusMessageList &statusMessages)
{
if (!m_allowStatusBar || !this->isFloating()) { return; }
m_statusBar.displayStatusMessages(statusMessages);
@@ -263,14 +265,7 @@ namespace BlackGui
void CDockWidget::toggleVisibility()
{
if (this->isVisible())
{
this->hide();
}
else
{
this->show();
}
this->setVisible(!this->isVisible());
}
void CDockWidget::toggleFrameless()
@@ -323,7 +318,8 @@ namespace BlackGui
const QByteArray geo(s.getGeometry());
if (!geo.isEmpty())
{
return this->restoreGeometry(geo);
const bool ok = this->restoreGeometry(geo);
if (ok) { this->rememberFloatingSizeAndPosition(); }
}
this->setMargins();
return true;
@@ -346,11 +342,12 @@ namespace BlackGui
{
CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_FrameDockWidget);
QDockWidget::paintEvent(event);
this->rememberFloatingSizeAndPosition();
}
void CDockWidget::mouseMoveEvent(QMouseEvent *event)
{
if (!handleMouseMoveEvent(event)) { QDockWidget::mouseMoveEvent(event); } ;
if (!handleMouseMoveEvent(event)) { QDockWidget::mouseMoveEvent(event); }
}
void CDockWidget::keyPressEvent(QKeyEvent *event)
@@ -430,7 +427,7 @@ namespace BlackGui
QThread::msleep(100);
# endif
this->setMargins();
this->setMargins(); // from settings or default
if (topLevel)
{
if (m_windowTitleBackup != QDockWidget::windowTitle())
@@ -441,10 +438,12 @@ namespace BlackGui
if (!m_wasAlreadyFloating)
{
this->initialFloating();
this->rememberFloatingSizeAndPosition();
}
else
{
if (m_wasFrameless) { this->setFrameless(true); }
this->restoreFloatingSizeAndPositionDeferred(); // after everything was applied move and resize
}
m_statusBar.show();
m_wasAlreadyFloating = true;
@@ -584,6 +583,30 @@ namespace BlackGui
this->setStyleSheet(qss);
}
void CDockWidget::rememberFloatingSizeAndPosition()
{
if (!this->isFloating()) { return; }
m_lastFloatingSize = this->size();
m_lastFloatingPosition = this->pos();
}
void CDockWidget::restoreFloatingSizeAndPosition()
{
if (!m_lastFloatingSize.isValid() || m_lastFloatingPosition.isNull()) { return; }
this->resize(m_lastFloatingSize);
this->move(m_lastFloatingPosition);
}
void CDockWidget::restoreFloatingSizeAndPositionDeferred()
{
if (!m_lastFloatingSize.isValid() || m_lastFloatingPosition.isNull()) { return; }
QPointer<CDockWidget> myself(this);
QTimer::singleShot(1000, this, [ = ]
{
if (myself) { myself->restoreFloatingSizeAndPosition(); }
});
}
CDockWidgetSettings CDockWidget::getSettings() const
{
if (this->objectName().isEmpty()) { return CDockWidgetSettings(); }