From e4fa5614d195550ed3ae884ae92bd610104868d9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 23 Jan 2024 18:23:30 -0500 Subject: [PATCH 1/2] GekkoSyntaxHighlight: Fix FPR terminal highlighting being treated as GPRs Copy-paste error. Ultimately GPR and FPRs use the same highlighting style anyway, so this is mostly just a correctness change. --- Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp b/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp index cdbbcf550d..b62628944f 100644 --- a/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp +++ b/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp @@ -52,7 +52,7 @@ public: break; case Terminal::FPR: - HighlightCurToken(HighlightFormat::GPR); + HighlightCurToken(HighlightFormat::FPR); break; case Terminal::SPR: From 100242a3805f2434544ff5a96e53f3548416d71b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 23 Jan 2024 18:39:57 -0500 Subject: [PATCH 2/2] GekkoSyntaxHighlight: Collapse cases for builtin color formats Same behavior, but without as much duplication. --- Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp b/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp index b62628944f..0523944f63 100644 --- a/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp +++ b/Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp @@ -221,17 +221,9 @@ void GekkoSyntaxHighlight::HighlightSubstr(int start, int len, HighlightFormat f hl_format.setForeground(IMM_COLOR[m_theme_idx]); break; case HighlightFormat::GPR: - hl_format.setForeground(BUILTIN_COLOR[m_theme_idx]); - break; case HighlightFormat::FPR: - hl_format.setForeground(BUILTIN_COLOR[m_theme_idx]); - break; case HighlightFormat::SPR: - hl_format.setForeground(BUILTIN_COLOR[m_theme_idx]); - break; case HighlightFormat::CRField: - hl_format.setForeground(BUILTIN_COLOR[m_theme_idx]); - break; case HighlightFormat::CRFlag: hl_format.setForeground(BUILTIN_COLOR[m_theme_idx]); break;