ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DolphinQt/Mapping: red = error, don't flash

This commit is contained in:
Tillmann Karras 2019-02-13 02:23:28 +00:00 committed by Léo Lam
parent 526698d2fc
commit 2195ef30f3
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
View File

@ -125,16 +125,11 @@ void MappingButton::UpdateIndicator()
const auto state = m_reference->State(); const auto state = m_reference->State();
QFont f = m_parent->font(); QFont f = m_parent->font();
QPalette p = m_parent->palette();
if (state > ControllerEmu::Buttons::ACTIVATION_THRESHOLD) if (state > ControllerEmu::Buttons::ACTIVATION_THRESHOLD)
{
f.setBold(true); f.setBold(true);
p.setColor(QPalette::ButtonText, Qt::red);
}
setFont(f); setFont(f);
setPalette(p);
} }
void MappingButton::ConfigChanged() void MappingButton::ConfigChanged()

9
Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
View File

@ -832,12 +832,9 @@ void CalibrationWidget::Update(Common::DVec2 point)
} }
else if (IsPointOutsideCalibration(point, m_input)) else if (IsPointOutsideCalibration(point, m_input))
{ {
// Flashing bold and red on miscalibration. // Bold and red on miscalibration.
if (QDateTime::currentDateTime().toMSecsSinceEpoch() % 500 < 350) f.setBold(true);
{ p.setColor(QPalette::ButtonText, Qt::red);
f.setBold(true);
p.setColor(QPalette::ButtonText, Qt::red);
}
} }
setFont(f); setFont(f);