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 T560, reset move position

Browse Source
This commit is contained in:
Klaus Basan
2019-03-30 06:44:03 +01:00
committed by Mat Sutcliffe
parent 0d0e093330
commit 66cbe1662e
6 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/enableforframelesswindow.cpp
View File

@@ -29,6 +29,8 @@
#include <QWidget>
#include <QMainWindow>
#include <QtGlobal>
#include <QPointer>
#include <QTimer>
using namespace BlackMisc;
@@ -127,6 +129,8 @@ namespace BlackGui
if (m_isMainApplicationWindow && CGuiUtility::isTopLevelWindow(m_widget))
{
m_widget->setAttribute(Qt::WA_NativeWindow);
// causeing a BLACK background
m_widget->setAttribute(Qt::WA_NoSystemBackground, frameless);
m_widget->setAttribute(Qt::WA_TranslucentBackground, frameless); // causing QTBUG-52206
}
@@ -181,7 +185,7 @@ namespace BlackGui
bool CEnableForFramelessWindow::handleMouseMoveEvent(QMouseEvent *event)
{
Q_ASSERT(m_widget);
if (m_windowMode == WindowFrameless && event->buttons() & Qt::LeftButton)
if (m_windowMode == WindowFrameless && event->buttons() & Qt::LeftButton && !m_framelessDragPosition.isNull())
{
m_widget->move(event->globalPos() - m_framelessDragPosition);
event->accept();
@@ -194,16 +198,21 @@ namespace BlackGui
{
if (event->type() != QEvent::WindowStateChange) { return false; }
if (m_windowMode != WindowTool) { return false; }
if (!m_widget) { return false; }
// make sure a tool window is changed to Normal window so it is show in taskbar
// here we are already in transition state, so isMinimized means will be minimize right now
// this check here is needed if minimized is called from somewhere else than ps_showMinimized
QPointer<QWidget> widgetSelf(m_widget); // almost as good as myself
if (m_widget->isMinimized())
{
// still tool, force normal window
// decouple, otherwise we end up in infinite loop as it triggers a new changeEvent
BlackMisc::singleShot(0, QThread::currentThread(), [ = ]()
QTimer::singleShot(0, m_widget, [ = ]
{
if (!widgetSelf) { return; }
this->showMinimizedModeChecked();
});
}
@@ -211,8 +220,9 @@ namespace BlackGui
{
// not tool, force tool window
// decouple, otherwise we end up in infinite loop as it triggers a new changeEvent
BlackMisc::singleShot(0, QThread::currentThread(), [ = ]()
QTimer::singleShot(0, m_widget, [ = ]
{
if (!widgetSelf) { return; }
this->showNormalModeChecked();
});
}