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 2021-03-09 20:24:51 +08:00
parent b51c6ce564
commit bc9edaf78a
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
utilities.cpp
View File

@ -430,6 +430,20 @@ static inline bool forceEnableOfficialMSWin10AcrylicBlur()
return qEnvironmentVariableIsSet(_flh_global::_flh_acrylic_forceOfficialMSWin10Blur_flag); return qEnvironmentVariableIsSet(_flh_global::_flh_acrylic_forceOfficialMSWin10Blur_flag);
} }
static inline bool shouldUseOfficialMSWin10AcrylicBlur()
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
const QOperatingSystemVersion currentVersion = QOperatingSystemVersion::current();
if (currentVersion > QOperatingSystemVersion::Windows10) {
return true;
}
return ((currentVersion.microVersion() >= 16190) && (currentVersion.microVersion() < 18362));
#else
// TODO
return false;
#endif
}
bool Utilities::isMSWin10AcrylicEffectAvailable() bool Utilities::isMSWin10AcrylicEffectAvailable()
{ {
if (!isWin10OrGreater()) { if (!isWin10OrGreater()) {
@ -442,16 +456,7 @@ bool Utilities::isMSWin10AcrylicEffectAvailable()
if (forceEnableOfficialMSWin10AcrylicBlur()) { if (forceEnableOfficialMSWin10AcrylicBlur()) {
return true; return true;
} }
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) return shouldUseOfficialMSWin10AcrylicBlur();
const QOperatingSystemVersion currentVersion = QOperatingSystemVersion::current();
if (currentVersion > QOperatingSystemVersion::Windows10) {
return true;
}
return ((currentVersion.microVersion() >= 16190) && (currentVersion.microVersion() < 18362));
#else
// TODO
return false;
#endif
} }
QWindow *Utilities::findWindow(const WId winId) QWindow *Utilities::findWindow(const WId winId)
@ -471,7 +476,7 @@ QWindow *Utilities::findWindow(const WId winId)
return nullptr; return nullptr;
} }
static inline bool shouldUseDwmBlur() static inline bool shouldUseTraditionalDwmBlur()
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
return Utilities::isWin10OrGreater() || (QOperatingSystemVersion::current() >= QOperatingSystemVersion::OSXYosemite); return Utilities::isWin10OrGreater() || (QOperatingSystemVersion::current() >= QOperatingSystemVersion::OSXYosemite);
@ -483,7 +488,7 @@ static inline bool shouldUseDwmBlur()
bool Utilities::isAcrylicEffectSupported() bool Utilities::isAcrylicEffectSupported()
{ {
if (forceEnableDwmBlur() || forceDisableWallpaperBlur()/* || shouldUseDwmBlur()*/) { if ((forceEnableDwmBlur() || forceDisableWallpaperBlur()) && shouldUseTraditionalDwmBlur()) {
return true; return true;
} }
return false; return false;

5
utilities_win32.cpp
View File

@ -537,5 +537,8 @@ QColor Utilities::getNativeWindowFrameColor(const bool isActive)
if (!isActive) { if (!isActive) {
return Qt::darkGray; return Qt::darkGray;
} }
return (isWin10OrGreater() && isColorizationEnabled()) ? getColorizationColor() : (isDarkThemeEnabled() ? Qt::white : Qt::black); if (!isWin10OrGreater()) {
return Qt::black;
}
return isColorizationEnabled() ? getColorizationColor() : (isDarkThemeEnabled() ? Qt::white : Qt::black);
} }