github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

minor tweaks 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-08-06 12:01:12 +08:00
parent 08a38f1d73
commit 3dbeb2721a
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/FramelessHelper/Core/framelesshelpercore_global.h
View File

@ -35,6 +35,8 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QScreen; class QScreen;
class QEvent;
class QEnterEvent;
QT_END_NAMESPACE QT_END_NAMESPACE
#ifndef FRAMELESSHELPER_CORE_API #ifndef FRAMELESSHELPER_CORE_API
@ -65,7 +67,7 @@ QT_END_NAMESPACE
#endif #endif
#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0)) #if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0))
# define QStringView const QString & using QStringView = const QString &;
#else #else
# include <QtCore/qstringview.h> # include <QtCore/qstringview.h>
#endif #endif
@ -85,14 +87,12 @@ QT_END_NAMESPACE
# define Q_CONSTEXPR2 # define Q_CONSTEXPR2
#endif #endif
#ifndef QT_NATIVE_EVENT_RESULT_TYPE #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
# if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) using QT_NATIVE_EVENT_RESULT_TYPE = qintptr;
# define QT_NATIVE_EVENT_RESULT_TYPE qintptr using QT_ENTER_EVENT_TYPE = QEnterEvent;
# define QT_ENTER_EVENT_TYPE QEnterEvent #else
# else using QT_NATIVE_EVENT_RESULT_TYPE = long;
# define QT_NATIVE_EVENT_RESULT_TYPE long using QT_ENTER_EVENT_TYPE = QEvent;
# define QT_ENTER_EVENT_TYPE QEvent
# endif
#endif #endif
#ifndef Q_DECLARE_METATYPE2 #ifndef Q_DECLARE_METATYPE2
@ -107,12 +107,12 @@ QT_END_NAMESPACE
# define QUtf8String(str) QString::fromUtf8(str) # define QUtf8String(str) QString::fromUtf8(str)
#endif #endif
#if (QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
using namespace Qt::StringLiterals; using namespace Qt::Literals::StringLiterals;
#endif #endif
#ifndef FRAMELESSHELPER_BYTEARRAY_LITERAL #ifndef FRAMELESSHELPER_BYTEARRAY_LITERAL
# if (QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)) # if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
# define FRAMELESSHELPER_BYTEARRAY_LITERAL(ba) ba##_ba # define FRAMELESSHELPER_BYTEARRAY_LITERAL(ba) ba##_ba
# elif (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)) # elif (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0))
# define FRAMELESSHELPER_BYTEARRAY_LITERAL(ba) ba##_qba # define FRAMELESSHELPER_BYTEARRAY_LITERAL(ba) ba##_qba
@ -122,7 +122,7 @@ QT_END_NAMESPACE
#endif #endif
#ifndef FRAMELESSHELPER_STRING_LITERAL #ifndef FRAMELESSHELPER_STRING_LITERAL
# if (QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)) # if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
# define FRAMELESSHELPER_STRING_LITERAL(str) u##str##_s # define FRAMELESSHELPER_STRING_LITERAL(str) u##str##_s
# elif (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)) # elif (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0))
# define FRAMELESSHELPER_STRING_LITERAL(str) u##str##_qs # define FRAMELESSHELPER_STRING_LITERAL(str) u##str##_qs

4
src/core/utils_win.cpp
View File

@ -629,7 +629,9 @@ void Utils::triggerFrameChange(const WId windowId)
return; return;
} }
const auto hwnd = reinterpret_cast<HWND>(windowId); const auto hwnd = reinterpret_cast<HWND>(windowId);
static constexpr const UINT flags = (SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER); static constexpr const UINT flags =
(SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOSIZE
| SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER);
if (SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, flags) == FALSE) { if (SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, flags) == FALSE) {
WARNING << getSystemErrorMessage(kSetWindowPos); WARNING << getSystemErrorMessage(kSetWindowPos);
} }