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

minor tweaks

This commit is contained in:
Zhao Yuhang 2023-11-11 16:26:32 +08:00
parent bb3f8e0d40
commit 7fdea56785
5 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ namespace Utils
[[nodiscard]] FRAMELESSHELPER_CORE_API quint32 defaultScreenDpi();
[[nodiscard]] FRAMELESSHELPER_CORE_API bool isWindowAccelerated(const QWindow *window);
[[nodiscard]] FRAMELESSHELPER_CORE_API bool isWindowTransparent(const QWindow *window);
[[nodiscard]] FRAMELESSHELPER_CORE_API QColor calculateForegroundColor(const QColor &backgroundColor);
#ifdef Q_OS_WINDOWS
[[nodiscard]] FRAMELESSHELPER_CORE_API bool isWindowsVersionOrGreater(const Global::WindowsVersion version);

11
src/core/chromepalette.cpp
View File

@ -93,16 +93,7 @@ void ChromePalettePrivate::refresh()
titleBarInactiveBackgroundColor_sys = (dark ? kDefaultSystemDarkColor : kDefaultWhiteColor);
titleBarActiveForegroundColor_sys = [this, dark, colorized]() -> QColor {
if (dark || colorized) {
// Calculate the most appropriate foreground color, based on the
// current background color.
const qreal grayF = (
(qreal(0.299) * titleBarActiveBackgroundColor_sys.redF()) +
(qreal(0.587) * titleBarActiveBackgroundColor_sys.greenF()) +
(qreal(0.114) * titleBarActiveBackgroundColor_sys.blueF()));
static constexpr const auto kFlag = qreal(0.5);
if ((grayF < kFlag) || qFuzzyCompare(grayF, kFlag)) {
return kDefaultWhiteColor;
}
return Utils::calculateForegroundColor(titleBarActiveBackgroundColor_sys);
}
return kDefaultBlackColor;
}();

51
src/core/utils.cpp
View File

@ -279,39 +279,28 @@ QColor Utils::calculateSystemButtonBackgroundColor(const SystemButtonType button
if (state == ButtonState::Normal) {
return kDefaultTransparentColor;
}
const bool isDark = (FramelessManager::instance()->systemTheme() == SystemTheme::Dark);
const bool isClose = (button == SystemButtonType::Close);
const bool isTitleColor = isTitleBarColorized();
const bool isHovered = (state == ButtonState::Hovered);
const auto result = [isDark, isClose, isTitleColor]() -> QColor {
auto result = [isDark, isClose, isTitleColor]() -> QColor {
if (isClose) {
return kDefaultSystemCloseButtonBackgroundColor;
}
if (isTitleColor) {
const auto accent = getAccentColor();
return [](const QColor &color) -> QColor {
// Calculate the most appropriate foreground color, based on the
// current background color.
const qreal grayF = (
(qreal(0.299) * color.redF()) +
(qreal(0.587) * color.greenF()) +
(qreal(0.114) * color.blueF()));
static constexpr const auto kFlag = qreal(0.5);
if ((grayF < kFlag) || qFuzzyCompare(grayF, kFlag)) {
return kDefaultWhiteColor;
return calculateForegroundColor(getAccentColor());
}
return kDefaultBlackColor;
}(accent);
}
return isDark ? kDefaultWhiteColor : kDefaultBlackColor;
return (isDark ? kDefaultWhiteColor : kDefaultBlackColor);
}();
if (isClose) {
return (isHovered ? result.lighter(110) : result.lighter(140));
}
return (isHovered ? QColor(result.red(), result.green(), result.blue(), 12) :
QColor(result.red(), result.green(), result.blue(), 6));
if (isHovered) {
result.setAlpha(12);
} else {
result.setAlpha(6);
}
return result;
}
bool Utils::shouldAppsUseDarkMode()
@ -654,4 +643,26 @@ bool Utils::isWindowTransparent(const QWindow *window)
return window->format().hasAlpha();
}
QColor Utils::calculateForegroundColor(const QColor &backgroundColor)
{
Q_ASSERT(backgroundColor.isValid());
if (!backgroundColor.isValid()) {
return kDefaultBlackColor;
}
static constexpr const auto kFlag = qreal(0.5);
if (backgroundColor.alphaF() < kFlag) {
return kDefaultBlackColor;
}
// Calculate the most appropriate foreground color, based on the
// current background color.
const qreal grayF = (
(qreal(0.299) * backgroundColor.redF()) +
(qreal(0.587) * backgroundColor.greenF()) +
(qreal(0.114) * backgroundColor.blueF()));
if ((grayF < kFlag) || qFuzzyCompare(grayF, kFlag)) {
return kDefaultWhiteColor;
}
return kDefaultBlackColor;
}
FRAMELESSHELPER_END_NAMESPACE

3
src/quick/quickstandardsystembutton.cpp
View File

@ -240,6 +240,9 @@ void QuickStandardSystemButton::updateColor()
if (!hover && !active && m_inactiveForegroundColor.isValid()) {
return m_inactiveForegroundColor;
}
if ((m_buttonType == QuickGlobal::SystemButtonType::Close) && hover) {
return kDefaultWhiteColor;
}
if (m_activeForegroundColor.isValid()) {
return m_activeForegroundColor;
}

11
src/widgets/standardsystembutton.cpp
View File

@ -305,12 +305,13 @@ void StandardSystemButton::paintEvent(QPaintEvent *event)
painter.save();
painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing
| QPainter::SmoothPixmapTransform);
const auto backgroundColor = [this, d]() -> QColor {
const bool isHovering = underMouse();
const auto backgroundColor = [isHovering, d, this]() -> QColor {
// The pressed state has higher priority than the hovered state.
if (isDown() && d->pressColor.isValid()) {
return d->pressColor;
}
if (underMouse() && d->hoverColor.isValid()) {
if (isHovering && d->hoverColor.isValid()) {
return d->hoverColor;
}
if (d->normalColor.isValid()) {
@ -323,11 +324,11 @@ void StandardSystemButton::paintEvent(QPaintEvent *event)
painter.fillRect(buttonRect, backgroundColor);
}
if (!d->glyph.isEmpty()) {
painter.setPen([this, d]() -> QColor {
if (!underMouse() && !d->active && d->inactiveForegroundColor.isValid()) {
painter.setPen([isHovering, d]() -> QColor {
if (!isHovering && !d->active && d->inactiveForegroundColor.isValid()) {
return d->inactiveForegroundColor;
}
if (d->buttonType == SystemButtonType::Close && underMouse()) {
if ((d->buttonType == SystemButtonType::Close) && isHovering) {
return kDefaultWhiteColor;
}
if (d->activeForegroundColor.isValid()) {