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

Minor tweaks. 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-11-12 20:58:04 +08:00
parent f35407ce5c
commit 13e974a078
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winnativeeventfilter.cpp
View File

@ -1010,7 +1010,7 @@ qreal GetDevicePixelRatioForWindow(const HWND handle)
return rect; return rect;
} }
void UpdateFrameMarginsForWindow(const HWND handle) void UpdateFrameMarginsForWindow(const HWND handle, const bool resetToDefault = false)
{ {
Q_ASSERT(handle); Q_ASSERT(handle);
if (WNEF_EXECUTE_WINAPI_RETURN(IsWindow, FALSE, handle)) { if (WNEF_EXECUTE_WINAPI_RETURN(IsWindow, FALSE, handle)) {
@ -1037,7 +1037,7 @@ void UpdateFrameMarginsForWindow(const HWND handle)
if (IsDwmCompositionEnabled() && !IsMaximized(handle) && !IsFullScreen(handle)) { if (IsDwmCompositionEnabled() && !IsMaximized(handle) && !IsFullScreen(handle)) {
margins.cyTopHeight = 1; margins.cyTopHeight = 1;
} }
if (shouldUseNativeTitleBar() || dontExtendFrame()) { if (resetToDefault || shouldUseNativeTitleBar() || dontExtendFrame()) {
// If we are going to use the native title bar, // If we are going to use the native title bar,
// we should use the original window frame as well. // we should use the original window frame as well.
margins = {0, 0, 0, 0}; margins = {0, 0, 0, 0};
@ -1291,11 +1291,14 @@ void WinNativeEventFilter::addFramelessWindow(QObject *window,
void WinNativeEventFilter::removeFramelessWindow(void *window) void WinNativeEventFilter::removeFramelessWindow(void *window)
{ {
Q_ASSERT(window); Q_ASSERT(window);
createUserData(reinterpret_cast<HWND>(window)); const auto hwnd = reinterpret_cast<HWND>(window);
createUserData(hwnd);
const auto data = getWindowData(window); const auto data = getWindowData(window);
if (data) { if (data) {
data->framelessModeEnabled = false; data->framelessModeEnabled = false;
} }
UpdateFrameMarginsForWindow(hwnd, true);
updateWindow(window, true, false);
} }
void WinNativeEventFilter::removeFramelessWindow(QObject *window) void WinNativeEventFilter::removeFramelessWindow(QObject *window)