From c9494bd579d06ae5ffc3217ee4bc66377831c118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 3 Feb 2026 23:30:45 +0100
Subject: [PATCH] Rename GamepadView->GamepadComponent

---
 UI/GamepadEmu.cpp             | 16 ++++++++--------
 UI/GamepadEmu.h               | 12 ++++++------
 UI/TiltAnalogSettingsScreen.h |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
index f052955404..4623abf722 100644
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@@ -85,9 +85,9 @@ static u32 GetButtonColor() {
 	return g_Config.iTouchButtonStyle != 0 ? 0xFFFFFF : 0xc0b080;
 }
 
-GamepadView::GamepadView(const char *key, UI::LayoutParams *layoutParams) : UI::View(layoutParams), key_(key) {}
+GamepadComponent::GamepadComponent(const char *key, UI::LayoutParams *layoutParams) : UI::View(layoutParams), key_(key) {}
 
-std::string GamepadView::DescribeText() const {
+std::string GamepadComponent::DescribeText() const {
 	auto co = GetI18NCategory(I18NCat::CONTROLS);
 	return std::string(co->T(key_));
 }
@@ -110,7 +110,7 @@ bool MultiTouchButton::CanGlide() const {
 bool MultiTouchButton::Touch(const TouchInput &input) {
 	_dbg_assert_(input.id >= 0 && input.id < TOUCH_MAX_POINTERS);
 
-	bool retval = GamepadView::Touch(input);
+	bool retval = GamepadComponent::Touch(input);
 	if ((input.flags & TouchInputFlags::DOWN) && bounds_.Contains(input.x, input.y)) {
 		pointerDownMask_ |= 1 << input.id;
 		usedPointerMask |= 1 << input.id;
@@ -286,7 +286,7 @@ bool PSPButton::IsDown() {
 }
 
 PSPDpad::PSPDpad(ImageID arrowIndex, const char *key, ImageID arrowDownIndex, ImageID overlayIndex, float scale, float spacing, UI::LayoutParams *layoutParams)
-	: GamepadView(key, layoutParams), arrowIndex_(arrowIndex), arrowDownIndex_(arrowDownIndex), overlayIndex_(overlayIndex),
+	: GamepadComponent(key, layoutParams), arrowIndex_(arrowIndex), arrowDownIndex_(arrowDownIndex), overlayIndex_(overlayIndex),
 		scale_(scale), spacing_(spacing), dragPointerId_(-1), down_(0) {
 }
 
@@ -302,7 +302,7 @@ void PSPDpad::GetContentDimensions(const UIContext &dc, float &w, float &h) cons
 }
 
 bool PSPDpad::Touch(const TouchInput &input) {
-	bool retval = GamepadView::Touch(input);
+	bool retval = GamepadComponent::Touch(input);
 
 	if (input.flags & TouchInputFlags::DOWN) {
 		if (dragPointerId_ == -1 && bounds_.Contains(input.x, input.y)) {
@@ -430,7 +430,7 @@ void PSPDpad::Draw(UIContext &dc) {
 }
 
 PSPStick::PSPStick(ImageID bgImg, const char *key, ImageID stickImg, ImageID stickDownImg, int stick, float scale, UI::LayoutParams *layoutParams)
-	: GamepadView(key, layoutParams), dragPointerId_(-1), bgImg_(bgImg), stickImageIndex_(stickImg), stickDownImg_(stickDownImg), stick_(stick), scale_(scale), centerX_(-1), centerY_(-1) {
+	: GamepadComponent(key, layoutParams), dragPointerId_(-1), bgImg_(bgImg), stickImageIndex_(stickImg), stickDownImg_(stickDownImg), stick_(stick), scale_(scale), centerX_(-1), centerY_(-1) {
 	stick_size_ = 50;
 }
 
@@ -474,7 +474,7 @@ void PSPStick::Draw(UIContext &dc) {
 }
 
 bool PSPStick::Touch(const TouchInput &input) {
-	bool retval = GamepadView::Touch(input);
+	bool retval = GamepadComponent::Touch(input);
 	if (input.flags & TouchInputFlags::RELEASE_ALL) {
 		dragPointerId_ = -1;
 		centerX_ = bounds_.centerX();
@@ -585,7 +585,7 @@ void PSPCustomStick::Draw(UIContext &dc) {
 }
 
 bool PSPCustomStick::Touch(const TouchInput &input) {
-	bool retval = GamepadView::Touch(input);
+	bool retval = GamepadComponent::Touch(input);
 	if (input.flags & TouchInputFlags::RELEASE_ALL) {
 		dragPointerId_ = -1;
 		centerX_ = bounds_.centerX();
diff --git a/UI/GamepadEmu.h b/UI/GamepadEmu.h
index 14009431b7..5847c0eb7e 100644
--- a/UI/GamepadEmu.h
+++ b/UI/GamepadEmu.h
@@ -26,9 +26,9 @@
 #include "Core/HLE/sceCtrl.h"
 #include "UI/EmuScreen.h"
 
-class GamepadView : public UI::View {
+class GamepadComponent : public UI::View {
 public:
-	GamepadView(const char *key, UI::LayoutParams *layoutParams);
+	GamepadComponent(const char *key, UI::LayoutParams *layoutParams);
 
 	bool Key(const KeyInput &input) override {
 		return false;
@@ -39,10 +39,10 @@ protected:
 	std::string key_;
 };
 
-class MultiTouchButton : public GamepadView {
+class MultiTouchButton : public GamepadComponent {
 public:
 	MultiTouchButton(const char *key, ImageID bgImg, ImageID bgDownImg, ImageID img, float scale, UI::LayoutParams *layoutParams)
-		: GamepadView(key, layoutParams), scale_(scale), bgImg_(bgImg), bgDownImg_(bgDownImg), img_(img) {
+		: GamepadComponent(key, layoutParams), scale_(scale), bgImg_(bgImg), bgDownImg_(bgDownImg), img_(img) {
 	}
 
 	bool Touch(const TouchInput &input) override;
@@ -97,7 +97,7 @@ private:
 	int pspButtonBit_;
 };
 
-class PSPDpad : public GamepadView {
+class PSPDpad : public GamepadComponent {
 public:
 	PSPDpad(ImageID arrowIndex, const char *key, ImageID arrowDownIndex, ImageID overlayIndex, float scale, float spacing, UI::LayoutParams *layoutParams);
 
@@ -118,7 +118,7 @@ private:
 	int down_;
 };
 
-class PSPStick : public GamepadView {
+class PSPStick : public GamepadComponent {
 public:
 	PSPStick(ImageID bgImg, const char *key, ImageID stickImg, ImageID stickDownImg, int stick, float scale, UI::LayoutParams *layoutParams);
 
diff --git a/UI/TiltAnalogSettingsScreen.h b/UI/TiltAnalogSettingsScreen.h
index 2f67a1da72..01977e4d5b 100644
--- a/UI/TiltAnalogSettingsScreen.h
+++ b/UI/TiltAnalogSettingsScreen.h
@@ -22,7 +22,7 @@
 #include "SimpleDialogScreen.h"
 
 class JoystickHistoryView;
-class GamepadView;
+class GamepadComponent;
 
 class TiltAnalogSettingsScreen : public UITwoPaneBaseDialogScreen {
 public: