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

Remove unneeded function 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-08-25 11:16:50 +08:00
parent de3d5440db
commit 406c801383
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/FramelessHelper/Core/utils.h
View File

@ -107,11 +107,6 @@ FRAMELESSHELPER_CORE_API void installSystemMenuHook(
const Global::IsInsideTitleBarDraggableAreaCallback &isInTitleBarArea, const Global::IsInsideTitleBarDraggableAreaCallback &isInTitleBarArea,
const Global::GetWindowDevicePixelRatioCallback &getDevicePixelRatio); const Global::GetWindowDevicePixelRatioCallback &getDevicePixelRatio);
FRAMELESSHELPER_CORE_API void uninstallSystemMenuHook(const WId windowId); FRAMELESSHELPER_CORE_API void uninstallSystemMenuHook(const WId windowId);
FRAMELESSHELPER_CORE_API void tryToBeCompatibleWithQtFramelessWindowHint(
const WId windowId,
const Global::GetWindowFlagsCallback &getWindowFlags,
const Global::SetWindowFlagsCallback &setWindowFlags,
const bool enable);
FRAMELESSHELPER_CORE_API void setAeroSnappingEnabled(const WId windowId, const bool enable); FRAMELESSHELPER_CORE_API void setAeroSnappingEnabled(const WId windowId, const bool enable);
FRAMELESSHELPER_CORE_API void tryToEnableHighestDpiAwarenessLevel(); FRAMELESSHELPER_CORE_API void tryToEnableHighestDpiAwarenessLevel();
FRAMELESSHELPER_CORE_API void updateGlobalWin32ControlsTheme(const WId windowId, const bool dark); FRAMELESSHELPER_CORE_API void updateGlobalWin32ControlsTheme(const WId windowId, const bool dark);

36
src/core/utils_win.cpp
View File

@ -57,6 +57,7 @@ Q_LOGGING_CATEGORY(lcUtilsWin, "wangwenx190.framelesshelper.core.utils.win")
using namespace Global; using namespace Global;
static constexpr const char kNoFixQtInternalEnvVar[] = "FRAMELESSHELPER_WINDOWS_DONT_FIX_QT";
static constexpr const wchar_t kDummyWindowClassName[] = L"org.wangwenx190.FramelessHelper.DummyWindow\0"; static constexpr const wchar_t kDummyWindowClassName[] = L"org.wangwenx190.FramelessHelper.DummyWindow\0";
static const QString qDwmColorKeyName = QString::fromWCharArray(kDwmColorKeyName); static const QString qDwmColorKeyName = QString::fromWCharArray(kDwmColorKeyName);
FRAMELESSHELPER_STRING_CONSTANT2(SuccessMessageText, "The operation completed successfully.") FRAMELESSHELPER_STRING_CONSTANT2(SuccessMessageText, "The operation completed successfully.")
@ -1171,6 +1172,9 @@ void Utils::fixupQtInternals(const WId windowId)
if (!windowId) { if (!windowId) {
return; return;
} }
if (qEnvironmentVariableIntValue(kNoFixQtInternalEnvVar)) {
return;
}
const auto hwnd = reinterpret_cast<HWND>(windowId); const auto hwnd = reinterpret_cast<HWND>(windowId);
SetLastError(ERROR_SUCCESS); SetLastError(ERROR_SUCCESS);
const auto oldClassStyle = static_cast<DWORD>(GetClassLongPtrW(hwnd, GCL_STYLE)); const auto oldClassStyle = static_cast<DWORD>(GetClassLongPtrW(hwnd, GCL_STYLE));
@ -1349,38 +1353,6 @@ void Utils::uninstallSystemMenuHook(const WId windowId)
g_utilsHelper()->data.remove(windowId); g_utilsHelper()->data.remove(windowId);
} }
void Utils::tryToBeCompatibleWithQtFramelessWindowHint(const WId windowId,
const GetWindowFlagsCallback &getWindowFlags,
const SetWindowFlagsCallback &setWindowFlags,
const bool enable)
{
Q_ASSERT(windowId);
Q_ASSERT(getWindowFlags);
Q_ASSERT(setWindowFlags);
if (!windowId || !getWindowFlags || !setWindowFlags) {
return;
}
const auto hwnd = reinterpret_cast<HWND>(windowId);
SetLastError(ERROR_SUCCESS);
const LONG_PTR originalWindowStyle = GetWindowLongPtrW(hwnd, GWL_STYLE);
if (originalWindowStyle == 0) {
WARNING << getSystemErrorMessage(kGetWindowLongPtrW);
return;
}
const Qt::WindowFlags originalWindowFlags = getWindowFlags();
const Qt::WindowFlags newWindowFlags = (enable ? (originalWindowFlags | Qt::FramelessWindowHint)
: (originalWindowFlags & ~Qt::FramelessWindowHint));
setWindowFlags(newWindowFlags);
// The trick is to restore the window style. Qt mainly adds the "WS_EX_LAYERED"
// flag to the extended window style.
SetLastError(ERROR_SUCCESS);
if (SetWindowLongPtrW(hwnd, GWL_STYLE, originalWindowStyle) == 0) {
WARNING << getSystemErrorMessage(kSetWindowLongPtrW);
return;
}
triggerFrameChange(windowId);
}
void Utils::setAeroSnappingEnabled(const WId windowId, const bool enable) void Utils::setAeroSnappingEnabled(const WId windowId, const bool enable)
{ {
Q_ASSERT(windowId); Q_ASSERT(windowId);