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

Update. 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-07-30 15:56:01 +08:00
parent e8213a7f3e
commit 0e6a944be7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winnativeeventfilter.cpp
View File

@ -889,6 +889,13 @@ QWindow *findQWindowFromRawHandle(const HWND handle)
return nullptr; return nullptr;
} }
void qCoreAppFixup()
{
if (!QCoreApplication::testAttribute(Qt::AA_DontCreateNativeWidgetSiblings)) {
QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
}
}
// The standard values of border width, border height and title bar height // The standard values of border width, border height and title bar height
// when DPI is 96. // when DPI is 96.
const int m_defaultBorderWidth = 8, m_defaultBorderHeight = 8, m_defaultTitleBarHeight = 30; const int m_defaultBorderWidth = 8, m_defaultBorderHeight = 8, m_defaultTitleBarHeight = 30;
@ -908,12 +915,14 @@ QList<HWND> m_framelessWindows;
WinNativeEventFilter::WinNativeEventFilter() WinNativeEventFilter::WinNativeEventFilter()
{ {
ResolveWin32APIs(); ResolveWin32APIs();
qCoreAppFixup();
} }
WinNativeEventFilter::~WinNativeEventFilter() = default; WinNativeEventFilter::~WinNativeEventFilter() = default;
void WinNativeEventFilter::install() void WinNativeEventFilter::install()
{ {
qCoreAppFixup();
if (m_instance.isNull()) { if (m_instance.isNull()) {
m_instance.reset(new WinNativeEventFilter); m_instance.reset(new WinNativeEventFilter);
qApp->installNativeEventFilter(m_instance.data()); qApp->installNativeEventFilter(m_instance.data());
@ -938,6 +947,7 @@ QList<HWND> WinNativeEventFilter::framelessWindows()
void WinNativeEventFilter::setFramelessWindows(const QList<HWND> &windows) void WinNativeEventFilter::setFramelessWindows(const QList<HWND> &windows)
{ {
qCoreAppFixup();
if (!windows.isEmpty() && (windows != m_framelessWindows)) { if (!windows.isEmpty() && (windows != m_framelessWindows)) {
m_framelessWindows = windows; m_framelessWindows = windows;
for (auto &&window : qAsConst(m_framelessWindows)) { for (auto &&window : qAsConst(m_framelessWindows)) {
@ -957,6 +967,7 @@ void WinNativeEventFilter::addFramelessWindow(const HWND window,
const int height) const int height)
{ {
ResolveWin32APIs(); ResolveWin32APIs();
qCoreAppFixup();
if (window && WNEF_EXECUTE_WINAPI_RETURN(IsWindow, FALSE, window) if (window && WNEF_EXECUTE_WINAPI_RETURN(IsWindow, FALSE, window)
&& !m_framelessWindows.contains(window)) { && !m_framelessWindows.contains(window)) {
m_framelessWindows.append(window); m_framelessWindows.append(window);