From 8c8c25f5e31fd5d6e4b4fc60baac6f33a6d97ea8 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Tue, 6 Aug 2024 13:39:31 +0200
Subject: ui pointer options: revert reset options to default when pressing Del
 (conflict with ctrlr cfg)

---
 src/frontend/mame/ui/ui.cpp       | 26 ++++----------------------
 src/frontend/mame/ui/ui.h         |  1 -
 src/frontend/mame/ui/videoopt.cpp |  6 ------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index aba04366d22..1f2bff2927c 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -191,16 +191,11 @@ struct mame_ui_manager::active_pointer
 struct mame_ui_manager::pointer_options
 {
 	pointer_options()
+		: timeout(std::chrono::seconds(3))
+		, hide_inactive(true)
+		, timeout_set(false)
+		, hide_inactive_set(false)
 	{
-		reset();
-	}
-
-	void reset()
-	{
-		timeout = std::chrono::seconds(3);
-		hide_inactive = true;
-		timeout_set = false;
-		hide_inactive_set = false;
 	}
 
 	bool options_set() const
@@ -1793,19 +1788,6 @@ bool mame_ui_manager::hide_inactive_pointers(int target) const noexcept
 }
 
 
-//-------------------------------------------------
-//  reset_pointer_options - reset per-target
-//  pointer options
-//-------------------------------------------------
-
-void mame_ui_manager::reset_pointer_options(int target) noexcept
-{
-	assert((0 <= target) && (m_pointer_options.size() > target));
-	if ((0 <= target) && (m_pointer_options.size() > target))
-		m_pointer_options[target].reset();
-}
-
-
 
 /***************************************************************************
     SLIDER CONTROLS
diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h
index 8fb6099dcc4..128300576e5 100644
--- a/src/frontend/mame/ui/ui.h
+++ b/src/frontend/mame/ui/ui.h
@@ -211,7 +211,6 @@ public:
 	void set_hide_inactive_pointers(int target, bool hide) noexcept;
 	std::chrono::steady_clock::duration pointer_activity_timeout(int target) const noexcept;
 	bool hide_inactive_pointers(int target) const noexcept;
-	void reset_pointer_options(int target) noexcept;
 
 	// drawing informational overlays
 	void draw_fps_counter(render_container &container);
diff --git a/src/frontend/mame/ui/videoopt.cpp b/src/frontend/mame/ui/videoopt.cpp
index e8a01c17391..e955590b0d8 100644
--- a/src/frontend/mame/ui/videoopt.cpp
+++ b/src/frontend/mame/ui/videoopt.cpp
@@ -400,12 +400,6 @@ bool menu_video_options::handle(event const *ev)
 				ui().set_hide_inactive_pointers(m_target.index(), !ui().hide_inactive_pointers(m_target.index()));
 				changed = true;
 				break;
-
-			// restore default
-			case IPT_UI_CLEAR:
-				ui().reset_pointer_options(m_target.index());
-				changed = true;
-				break;
 			}
 			break;
 
-- 
cgit v1.2.3