Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

Update. 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-08-13 16:29:12 +08:00
parent 9d06d67c9d
commit c9e38491ae
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
framelessquickhelper.cpp
View File

@ -24,20 +24,22 @@
#include "framelessquickhelper.h" #include "framelessquickhelper.h"
#ifdef Q_OS_WINDOWS
#include "winnativeeventfilter.h"
#endif
#include <QQuickWindow> #include <QQuickWindow>
#include <QScreen> #include <QScreen>
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
namespace { #include "winnativeeventfilter.h"
#else
const int m_defaultBorderWidth = 8, m_defaultBorderHeight = 8, m_defaultTitleBarHeight = 30; #include "framelesshelper.h"
}
#endif #endif
namespace {
#ifdef Q_OS_WINDOWS
const int m_defaultBorderWidth = 8, m_defaultBorderHeight = 8, m_defaultTitleBarHeight = 30;
#else
FramelessHelper m_framelessHelper;
#endif
}
FramelessQuickHelper::FramelessQuickHelper(QQuickItem *parent) : QQuickItem(parent) {} FramelessQuickHelper::FramelessQuickHelper(QQuickItem *parent) : QQuickItem(parent) {}
int FramelessQuickHelper::borderWidth() const int FramelessQuickHelper::borderWidth() const

9
framelessquickhelper.h
View File

@ -32,10 +32,6 @@
#define Q_OS_WINDOWS #define Q_OS_WINDOWS
#endif #endif
#ifndef Q_OS_WINDOWS
#include "framelesshelper.h"
#endif
#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
#define Q_DISABLE_MOVE(Class) \ #define Q_DISABLE_MOVE(Class) \
Class(Class &&) = delete; \ Class(Class &&) = delete; \
@ -119,9 +115,4 @@ Q_SIGNALS:
void minimumSizeChanged(const QSize &); void minimumSizeChanged(const QSize &);
void maximumSizeChanged(const QSize &); void maximumSizeChanged(const QSize &);
void titleBarEnabledChanged(bool); void titleBarEnabledChanged(bool);
private:
#ifndef Q_OS_WINDOWS
FramelessHelper m_framelessHelper;
#endif
}; };