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

Add a null pointer check. 

Also apply new code format.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-06-06 09:26:30 +08:00
parent 18af58c2e6
commit aa93f72c10
2 changed files with 298 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

543
winnativeeventfilter.cpp
View File

File diff suppressed because it is too large Load Diff

41
winnativeeventfilter.h
View File

@ -39,30 +39,32 @@ QT_FORWARD_DECLARE_CLASS(QWindow)
QT_END_NAMESPACE QT_END_NAMESPACE
#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; \
Class &operator=(Class &&) = delete; Class &operator=(Class &&) = delete;
#define Q_DISABLE_COPY_MOVE(Class) \ #define Q_DISABLE_COPY_MOVE(Class) \
Q_DISABLE_COPY(Class) \ Q_DISABLE_COPY(Class) \
Q_DISABLE_MOVE(Class) Q_DISABLE_MOVE(Class)
#endif #endif
class WinNativeEventFilter : public QAbstractNativeEventFilter { class WinNativeEventFilter : public QAbstractNativeEventFilter
{
Q_DISABLE_COPY_MOVE(WinNativeEventFilter) Q_DISABLE_COPY_MOVE(WinNativeEventFilter)
public: public:
using WINDOWDATA = struct _WINDOWDATA { using WINDOWDATA = struct _WINDOWDATA
BOOL fixedSize = FALSE, mouseTransparent = FALSE, {
restoreDefaultWindowStyle = FALSE, enableLayeredWindow = FALSE, BOOL fixedSize = FALSE, mouseTransparent = FALSE, restoreDefaultWindowStyle = FALSE,
disableTitleBar = FALSE; enableLayeredWindow = FALSE, disableTitleBar = FALSE;
int borderWidth = -1, borderHeight = -1, titleBarHeight = -1; int borderWidth = -1, borderHeight = -1, titleBarHeight = -1;
QVector<QRect> ignoreAreas = {}, draggableAreas = {}; QVector<QRect> ignoreAreas = {}, draggableAreas = {};
QVector<QPointer<QObject>> ignoreObjects = {}, draggableObjects = {}; QVector<QPointer<QObject>> ignoreObjects = {}, draggableObjects = {};
QSize maximumSize = {-1, -1}, minimumSize = {-1, -1}; QSize maximumSize = {-1, -1}, minimumSize = {-1, -1};
}; };
using WINDOW = struct _WINDOW { using WINDOW = struct _WINDOW
{
BOOL initialized = FALSE; BOOL initialized = FALSE;
WINDOWDATA windowData; WINDOWDATA windowData;
}; };
@ -81,8 +83,10 @@ public:
// change them, pass negative values to the parameters. // change them, pass negative values to the parameters.
static void addFramelessWindow(const HWND window, static void addFramelessWindow(const HWND window,
const WINDOWDATA *data = nullptr, const WINDOWDATA *data = nullptr,
const bool center = false, const int x = -1, const bool center = false,
const int y = -1, const int width = -1, const int x = -1,
const int y = -1,
const int width = -1,
const int height = -1); const int height = -1);
static void removeFramelessWindow(const HWND window); static void removeFramelessWindow(const HWND window);
static void clearFramelessWindows(); static void clearFramelessWindows();
@ -105,7 +109,8 @@ public:
// System metric value of the given window (if the pointer is null, // System metric value of the given window (if the pointer is null,
// return the system's standard value). // return the system's standard value).
static int getSystemMetric(const HWND handle, const SystemMetric metric, static int getSystemMetric(const HWND handle,
const SystemMetric metric,
const bool dpiAware = false); const bool dpiAware = false);
// Use this function to trigger a frame change event or redraw a // Use this function to trigger a frame change event or redraw a
@ -118,8 +123,8 @@ public:
// Change the geometry of a window through Win32 API. // Change the geometry of a window through Win32 API.
// The width and height will be scaled automatically according to DPI. So // The width and height will be scaled automatically according to DPI. So
// just pass the original value. // just pass the original value.
static void setWindowGeometry(const HWND handle, const int x, const int y, static void setWindowGeometry(
const int width, const int height); const HWND handle, const int x, const int y, const int width, const int height);
// Move the window to the center of the desktop. // Move the window to the center of the desktop.
static void moveWindowToDesktopCenter(const HWND handle); static void moveWindowToDesktopCenter(const HWND handle);
@ -130,11 +135,9 @@ public:
static void updateQtFrame(QWindow *const window, const int titleBarHeight); static void updateQtFrame(QWindow *const window, const int titleBarHeight);
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
bool nativeEventFilter(const QByteArray &eventType, void *message, bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
qintptr *result) override;
#else #else
bool nativeEventFilter(const QByteArray &eventType, void *message, bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
long *result) override;
#endif #endif
private: private: