dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-07 07:43:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7799 from Tilka/mapping

Browse Source 
DolphinQt/Mapping: red = error, don't flash
This commit is contained in:
Léo Lam 2019-05-26 18:10:06 +02:00 committed by GitHub
commit f92c17e76f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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();
QFont f = m_parent->font();
QPalette p = m_parent->palette();
if (state > ControllerEmu::Buttons::ACTIVATION_THRESHOLD)
{
f.setBold(true);
p.setColor(QPalette::ButtonText, Qt::red);
}
setFont(f);
setPalette(p);
}
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))
{
// Flashing bold and red on miscalibration.
if (QDateTime::currentDateTime().toMSecsSinceEpoch() % 500 < 350)
{
f.setBold(true);
p.setColor(QPalette::ButtonText, Qt::red);
}
// Bold and red on miscalibration.
f.setBold(true);
p.setColor(QPalette::ButtonText, Qt::red);
}
setFont(f);