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

simplify code a little 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-08-22 18:02:03 +08:00
parent f484209b94
commit de3d5440db
2 changed files with 21 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/core/chromepalette.cpp
View File

@ -139,91 +139,61 @@ ChromePalette::~ChromePalette() = default;
QColor ChromePalette::titleBarActiveBackgroundColor() const QColor ChromePalette::titleBarActiveBackgroundColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->titleBarActiveBackgroundColor.has_value()) { return d->titleBarActiveBackgroundColor.value_or(d->titleBarActiveBackgroundColor_sys);
return d->titleBarActiveBackgroundColor.value();
}
return d->titleBarActiveBackgroundColor_sys;
} }
QColor ChromePalette::titleBarInactiveBackgroundColor() const QColor ChromePalette::titleBarInactiveBackgroundColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->titleBarInactiveBackgroundColor.has_value()) { return d->titleBarInactiveBackgroundColor.value_or(d->titleBarInactiveBackgroundColor_sys);
return d->titleBarInactiveBackgroundColor.value();
}
return d->titleBarInactiveBackgroundColor_sys;
} }
QColor ChromePalette::titleBarActiveForegroundColor() const QColor ChromePalette::titleBarActiveForegroundColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->titleBarActiveForegroundColor.has_value()) { return d->titleBarActiveForegroundColor.value_or(d->titleBarActiveForegroundColor_sys);
return d->titleBarActiveForegroundColor.value();
}
return d->titleBarActiveForegroundColor_sys;
} }
QColor ChromePalette::titleBarInactiveForegroundColor() const QColor ChromePalette::titleBarInactiveForegroundColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->titleBarInactiveForegroundColor.has_value()) { return d->titleBarInactiveForegroundColor.value_or(d->titleBarInactiveForegroundColor_sys);
return d->titleBarInactiveForegroundColor.value();
}
return d->titleBarInactiveForegroundColor_sys;
} }
QColor ChromePalette::chromeButtonNormalColor() const QColor ChromePalette::chromeButtonNormalColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->chromeButtonNormalColor.has_value()) { return d->chromeButtonNormalColor.value_or(d->chromeButtonNormalColor_sys);
return d->chromeButtonNormalColor.value();
}
return d->chromeButtonNormalColor_sys;
} }
QColor ChromePalette::chromeButtonHoverColor() const QColor ChromePalette::chromeButtonHoverColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->chromeButtonHoverColor.has_value()) { return d->chromeButtonHoverColor.value_or(d->chromeButtonHoverColor_sys);
return d->chromeButtonHoverColor.value();
}
return d->chromeButtonHoverColor_sys;
} }
QColor ChromePalette::chromeButtonPressColor() const QColor ChromePalette::chromeButtonPressColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->chromeButtonPressColor.has_value()) { return d->chromeButtonPressColor.value_or(d->chromeButtonPressColor_sys);
return d->chromeButtonPressColor.value();
}
return d->chromeButtonPressColor_sys;
} }
QColor ChromePalette::closeButtonNormalColor() const QColor ChromePalette::closeButtonNormalColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->closeButtonNormalColor.has_value()) { return d->closeButtonNormalColor.value_or(d->closeButtonNormalColor_sys);
return d->closeButtonNormalColor.value();
}
return d->closeButtonNormalColor_sys;
} }
QColor ChromePalette::closeButtonHoverColor() const QColor ChromePalette::closeButtonHoverColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->closeButtonHoverColor.has_value()) { return d->closeButtonHoverColor.value_or(d->closeButtonHoverColor_sys);
return d->closeButtonHoverColor.value();
}
return d->closeButtonHoverColor_sys;
} }
QColor ChromePalette::closeButtonPressColor() const QColor ChromePalette::closeButtonPressColor() const
{ {
Q_D(const ChromePalette); Q_D(const ChromePalette);
if (d->closeButtonPressColor.has_value()) { return d->closeButtonPressColor.value_or(d->closeButtonPressColor_sys);
return d->closeButtonPressColor.value();
}
return d->closeButtonPressColor_sys;
} }
void ChromePalette::setTitleBarActiveBackgroundColor(const QColor &value) void ChromePalette::setTitleBarActiveBackgroundColor(const QColor &value)
@ -233,8 +203,7 @@ void ChromePalette::setTitleBarActiveBackgroundColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->titleBarActiveBackgroundColor.has_value() if (d->titleBarActiveBackgroundColor.value_or(QColor()) == value) {
&& (d->titleBarActiveBackgroundColor.value() == value)) {
return; return;
} }
d->titleBarActiveBackgroundColor = value; d->titleBarActiveBackgroundColor = value;
@ -257,8 +226,7 @@ void ChromePalette::setTitleBarInactiveBackgroundColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->titleBarInactiveBackgroundColor.has_value() if (d->titleBarInactiveBackgroundColor.value_or(QColor()) == value) {
&& (d->titleBarInactiveBackgroundColor.value() == value)) {
return; return;
} }
d->titleBarInactiveBackgroundColor = value; d->titleBarInactiveBackgroundColor = value;
@ -281,8 +249,7 @@ void ChromePalette::setTitleBarActiveForegroundColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->titleBarActiveForegroundColor.has_value() if (d->titleBarActiveForegroundColor.value_or(QColor()) == value) {
&& (d->titleBarActiveForegroundColor.value() == value)) {
return; return;
} }
d->titleBarActiveForegroundColor = value; d->titleBarActiveForegroundColor = value;
@ -305,8 +272,7 @@ void ChromePalette::setTitleBarInactiveForegroundColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->titleBarInactiveForegroundColor.has_value() if (d->titleBarInactiveForegroundColor.value_or(QColor()) == value) {
&& (d->titleBarInactiveForegroundColor.value() == value)) {
return; return;
} }
d->titleBarInactiveForegroundColor = value; d->titleBarInactiveForegroundColor = value;
@ -329,8 +295,7 @@ void ChromePalette::setChromeButtonNormalColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->chromeButtonNormalColor.has_value() if (d->chromeButtonNormalColor.value_or(QColor()) == value) {
&& (d->chromeButtonNormalColor.value() == value)) {
return; return;
} }
d->chromeButtonNormalColor = value; d->chromeButtonNormalColor = value;
@ -353,8 +318,7 @@ void ChromePalette::setChromeButtonHoverColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->chromeButtonHoverColor.has_value() if (d->chromeButtonHoverColor.value_or(QColor()) == value) {
&& (d->chromeButtonHoverColor.value() == value)) {
return; return;
} }
d->chromeButtonHoverColor = value; d->chromeButtonHoverColor = value;
@ -377,8 +341,7 @@ void ChromePalette::setChromeButtonPressColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->chromeButtonPressColor.has_value() if (d->chromeButtonPressColor.value_or(QColor()) == value) {
&& (d->chromeButtonPressColor.value() == value)) {
return; return;
} }
d->chromeButtonPressColor = value; d->chromeButtonPressColor = value;
@ -401,8 +364,7 @@ void ChromePalette::setCloseButtonNormalColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->closeButtonNormalColor.has_value() if (d->closeButtonNormalColor.value_or(QColor()) == value) {
&& (d->closeButtonNormalColor.value() == value)) {
return; return;
} }
d->closeButtonNormalColor = value; d->closeButtonNormalColor = value;
@ -425,8 +387,7 @@ void ChromePalette::setCloseButtonHoverColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->closeButtonHoverColor.has_value() if (d->closeButtonHoverColor.value_or(QColor()) == value) {
&& (d->closeButtonHoverColor.value() == value)) {
return; return;
} }
d->closeButtonHoverColor = value; d->closeButtonHoverColor = value;
@ -449,8 +410,7 @@ void ChromePalette::setCloseButtonPressColor(const QColor &value)
return; return;
} }
Q_D(ChromePalette); Q_D(ChromePalette);
if (d->closeButtonPressColor.has_value() if (d->closeButtonPressColor.value_or(QColor()) == value) {
&& (d->closeButtonPressColor.value() == value)) {
return; return;
} }
d->closeButtonPressColor = value; d->closeButtonPressColor = value;

5
src/core/sysapiloader.cpp
View File

@ -105,10 +105,7 @@ QFunctionPointer SysApiLoader::get(const QString &function)
} }
const QMutexLocker locker(&m_mutex); const QMutexLocker locker(&m_mutex);
if (m_functionCache.contains(function)) { if (m_functionCache.contains(function)) {
const std::optional<QFunctionPointer> symbol = m_functionCache.value(function); return m_functionCache.value(function).value_or(nullptr);
if (symbol.has_value()) {
return symbol.value();
}
} }
return nullptr; return nullptr;
} }