Merge pull request #7799 from Tilka/mapping

DolphinQt/Mapping: red = error, don't flash
dolphin-emu · May 26, 2019 · f92c17e · f92c17e
2 parents f819ea6 + 2195ef3
commit f92c17e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -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()

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -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);