From 1a35a42b2d2b93d7ec3d961d138cbf6b5fe996d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 8 Jul 2026 18:18:00 +0200
Subject: [PATCH] Minor code modernization

---
 UI/DevScreens.cpp | 42 +++++++++++++++++-------------------------
 UI/DevScreens.h   |  6 ------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index b9432c0dd2..665cca9720 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -163,13 +163,23 @@ void DevMenuScreen::CreatePopupContents(UI::ViewGroup *parent) {
 		});
 	}
 
-	items->Add(new Choice(sy->T("Developer Tools")))->OnClick.Handle(this, &DevMenuScreen::OnDeveloperTools);
+	items->Add(new Choice(sy->T("Developer Tools")))->OnClick.Add([this](UI::EventParams &e) {
+		UpdateUIState(UISTATE_PAUSEMENU);
+		screenManager()->push(new DeveloperToolsScreen(gamePath_));
+	});
 
 	// Debug overlay
 	AddOverlayList(items, screenManager());
 
-	items->Add(new Choice(dev->T("Jit Compare")))->OnClick.Handle(this, &DevMenuScreen::OnJitCompare);
-	items->Add(new Choice(dev->T("Shader Viewer")))->OnClick.Handle(this, &DevMenuScreen::OnShaderView);
+	items->Add(new Choice(dev->T("Jit Compare")))->OnClick.Add([this](UI::EventParams &e) {
+		UpdateUIState(UISTATE_PAUSEMENU);
+		screenManager()->push(new JitCompareScreen());
+	});
+	items->Add(new Choice(dev->T("Shader Viewer")))->OnClick.Add([this](UI::EventParams &e) {
+		UpdateUIState(UISTATE_PAUSEMENU);
+		if (gpu)  // Avoid crashing if chosen while the game is being loaded.
+			screenManager()->push(new ShaderListScreen());
+	});
 
 	items->Add(new Choice(dev->T("Toggle Freeze")))->OnClick.Add([](UI::EventParams &e) {
 		if (PSP_CoreParameter().frozen) {
@@ -179,9 +189,11 @@ void DevMenuScreen::CreatePopupContents(UI::ViewGroup *parent) {
 		}
 	});
 
-	items->Add(new Choice(dev->T("Reset limited logging")))->OnClick.Handle(this, &DevMenuScreen::OnResetLimitedLogging);
+	items->Add(new Choice(dev->T("Reset limited logging")))->OnClick.Add([](UI::EventParams &e) {
+		Reporting::ResetCounts();
+	});
 
-	items->Add(new Choice(dev->T("GPI/GPO switches/LEDs")))->OnClick.Add([=](UI::EventParams &e) {
+	items->Add(new Choice(dev->T("GPI/GPO switches/LEDs")))->OnClick.Add([this, dev](UI::EventParams &e) {
 		screenManager()->push(new GPIGPOScreen(dev->T("GPI/GPO switches/LEDs")));
 	});
 
@@ -226,26 +238,6 @@ void DevMenuScreen::CreatePopupContents(UI::ViewGroup *parent) {
 	g_logManager.EnableOutput(LogOutput::RingBuffer);
 }
 
-void DevMenuScreen::OnResetLimitedLogging(UI::EventParams &e) {
-	Reporting::ResetCounts();
-}
-
-void DevMenuScreen::OnDeveloperTools(UI::EventParams &e) {
-	UpdateUIState(UISTATE_PAUSEMENU);
-	screenManager()->push(new DeveloperToolsScreen(gamePath_));
-}
-
-void DevMenuScreen::OnJitCompare(UI::EventParams &e) {
-	UpdateUIState(UISTATE_PAUSEMENU);
-	screenManager()->push(new JitCompareScreen());
-}
-
-void DevMenuScreen::OnShaderView(UI::EventParams &e) {
-	UpdateUIState(UISTATE_PAUSEMENU);
-	if (gpu)  // Avoid crashing if chosen while the game is being loaded.
-		screenManager()->push(new ShaderListScreen());
-}
-
 void DevMenuScreen::dialogFinished(const Screen *dialog, DialogResult result) {
 	UpdateUIState(UISTATE_INGAME);
 	// Close when a subscreen got closed.
diff --git a/UI/DevScreens.h b/UI/DevScreens.h
index 3636eccf09..1f9a7b2e49 100644
--- a/UI/DevScreens.h
+++ b/UI/DevScreens.h
@@ -40,12 +40,6 @@ public:
 	void CreatePopupContents(UI::ViewGroup *parent) override;
 	void dialogFinished(const Screen *dialog, DialogResult result) override;
 
-protected:
-	void OnJitCompare(UI::EventParams &e);
-	void OnShaderView(UI::EventParams &e);
-	void OnDeveloperTools(UI::EventParams &e);
-	void OnResetLimitedLogging(UI::EventParams &e);
-
 private:
 	Path gamePath_;
 };