qml: Fix FloatingWindow.cpp building on Windows

This commit is contained in:
Sergio Martins
2020-07-27 10:32:33 +01:00
parent 08721ea458
commit c64b938e40
2 changed files with 6 additions and 6 deletions

View File

@@ -26,13 +26,13 @@
#include <QAbstractNativeEventFilter>
#include <QWindow>
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(KDDOCKWIDGETS_QTWIDGETS)
# include <Windows.h>
#endif
using namespace KDDockWidgets;
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(KDDOCKWIDGETS_QTWIDGETS)
namespace KDDockWidgets {
@@ -79,7 +79,7 @@ FloatingWindow::FloatingWindow(MainWindowBase *parent)
, m_dropArea(new DropArea(this))
, m_titleBar(Config::self().frameworkWidgetFactory()->createTitleBar(this))
{
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(KDDOCKWIDGETS_QTWIDGETS)
if (KDDockWidgets::usesAeroSnapWithCustomDecos()) {
m_nchittestFilter = new NCHITTESTEventFilter(this);
qApp->installNativeEventFilter(m_nchittestFilter);
@@ -89,7 +89,7 @@ FloatingWindow::FloatingWindow(MainWindowBase *parent)
DockRegistry::self()->registerNestedWindow(this);
qCDebug(creation) << "FloatingWindow()" << this;
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(KDDOCKWIDGETS_QTWIDGETS)
# if QT_VERSION < 0x051000
// On Windows with Qt 5.9 (and maybe later but we don't care), the WM_NCALCSIZE isn't being processed unless we explicitly create the window.
// So create it now, otherwise floating dock widgets will show a native title bar until resized.
@@ -162,7 +162,7 @@ FloatingWindow::~FloatingWindow()
qCDebug(creation) << "~FloatingWindow";
}
#if defined(Q_OS_WIN)
#if defined(Q_OS_WIN) && defined(KDDOCKWIDGETS_QTWIDGETS)
bool FloatingWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
{
if (KDDockWidgets::usesAeroSnapWithCustomDecos()) {

View File

@@ -124,7 +124,7 @@ Q_SIGNALS:
void numFramesChanged();
void windowStateChanged(QWindowStateChangeEvent *);
protected:
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(KDDOCKWIDGETS_QTWIDGETS)
bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
#endif