Merge pull request #13123 from jordan-woyak/mapping-indicator-dark-theme-code-cleanup

DolphinQt/MappingIndicator: Use Settings::IsThemeDark instead of reimplementing it.
This commit is contained in:
Tilka 2024-10-12 01:24:43 +01:00 committed by GitHub
commit 67e8f37c5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions

View File

@ -29,6 +29,7 @@
#include "DolphinQt/Config/Mapping/MappingWidget.h" #include "DolphinQt/Config/Mapping/MappingWidget.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Settings.h"
namespace namespace
{ {
@ -96,7 +97,7 @@ QColor MappingIndicator::GetCenterColor() const
QColor MappingIndicator::GetDeadZoneColor() const QColor MappingIndicator::GetDeadZoneColor() const
{ {
QColor color = GetBBoxBrush().color().valueF() > 0.5 ? Qt::black : Qt::white; QColor color = Settings::Instance().IsThemeDark() ? Qt::white : Qt::black;
color.setAlphaF(0.25); color.setAlphaF(0.25);
return color; return color;
} }
@ -126,7 +127,7 @@ QColor MappingIndicator::GetAltTextColor() const
void MappingIndicator::AdjustGateColor(QColor* color) void MappingIndicator::AdjustGateColor(QColor* color)
{ {
if (GetBBoxBrush().color().valueF() < 0.5) if (Settings::Instance().IsThemeDark())
color->setHsvF(color->hueF(), color->saturationF(), 1 - color->valueF()); color->setHsvF(color->hueF(), color->saturationF(), 1 - color->valueF());
} }