[QoL] Group Gameplay settings with section headers for readability

Source/DiabloUI/settingsmenu.cpp

@@ -12,7 +12,7 @@
 #include <SDL3/SDL_rect.h>
 #include <SDL3/SDL_timer.h>
 #else
 #include <SDL.h>
 #endif
 
 #include <function_ref.hpp>
@@ -82,7 +82,7 @@
 };
 
 ControllerButtonCombo padEntryCombo {};
 Uint32 padEntryStartTime = 0;
 std::string padEntryTimerText;
 
 bool IsValidEntry(OptionEntryBase *pOptionEntry)
@@ -107,6 +107,41 @@
 	return GetLineWidth("{}: {}", formatArgs.data(), formatArgs.size(), 0, GameFontTables::GameFont24, 1) >= (rectList.size.width - 90);
 }
 
+void AddSettingsSpacer()
+{
+	vecDialogItems.push_back(std::make_unique<UiListItem>(
+	    std::string_view {}, static_cast<int>(SpecialMenuEntry::None), UiFlags::ElementDisabled));
+}
+
+void AddSettingsSectionHeader(std::string_view text, bool addSpacer)
+{
+	if (addSpacer)
+		AddSettingsSpacer();
+	vecDialogItems.push_back(std::make_unique<UiListItem>(
+	    text, static_cast<int>(SpecialMenuEntry::None), UiFlags::ColorWhitegold | UiFlags::ElementDisabled));
+}
+
+void MaybeAddGameplaySectionHeader(OptionEntryBase *pEntry)
+{
+	if (selectedCategory != &GetOptions().Gameplay)
+		return;
+
+	const GameplayOptions &gameplay = GetOptions().Gameplay;
+
+	// Sections are intentionally lightweight: just labels/separators, no submenus and no changes to options model.
+	if (pEntry == &gameplay.friendlyFire) {
+		AddSettingsSectionHeader(_("Game Rules"), false);
+	} else if (pEntry == &gameplay.runInTown) {
+		AddSettingsSectionHeader(_("Controls"), true);
+	} else if (pEntry == &gameplay.experienceBar) {
+		AddSettingsSectionHeader(_("Interface"), true);
+	} else if (pEntry == &gameplay.autoRefillBelt) {
+		AddSettingsSectionHeader(_("Items & Auto Pickup"), true);
+	} else if (pEntry == &gameplay.disableCripplingShrines) {
+		AddSettingsSectionHeader(_("Safety & Focus"), true);
+	}
+}
+
 void CleanUpSettingsUI()
 {
 	UiInitList_clear();
@@ -139,7 +174,7 @@
 void StartPadEntryTimer()
 {
 	padEntryCombo = ControllerButton_NONE;
 	padEntryStartTime = SDL_GetTicks();
 	if (padEntryStartTime == 0)
 		padEntryStartTime++;
 	// Removes access to these dialog items while entering bindings
@@ -167,7 +202,7 @@
 		StopPadEntryTimer();
 		return;
 	}
 	padEntryTimerText = StrCat(_("Press gamepad buttons to change."), " ", 10 - elapsed / 1000);
 	vecDialogItems[IndexPadTimerText]->m_text = padEntryTimerText;
 }
 
@@ -243,7 +278,7 @@
 	return true;
 }
 
 void ItemSelected(size_t value)
 {
 	auto &vecItem = vecDialogItems[value];
 	const int vecItemValue = vecItem->m_value;
@@ -257,7 +292,7 @@
 			break;
 		case SpecialMenuEntry::UnbindKey: {
 			auto *pOptionKey = static_cast<KeymapperOptions::Action *>(selectedOption);
 			pOptionKey->SetValue(SDLK_UNKNOWN);
 			vecDialogItems[IndexKeyOrPadInput]->m_text = selectedOption->GetValueDescription();
 			break;
 		}
@@ -359,7 +394,7 @@
 
 } // namespace
 
 void UiSettingsMenu()
 {
 	backToMain = false;
 	shownMenu = ShownMenuType::Categories;
@@ -401,7 +436,7 @@
 		vecDialog.push_back(std::make_unique<UiArtText>(titleText.data(), MakeSdlRect(uiRectangle.position.x, uiRectangle.position.y + 161, uiRectangle.size.width, 35), UiFlags::FontSize30 | UiFlags::ColorUiSilver | UiFlags::AlignCenter, 8));
 
 		size_t itemToSelect = 0;
 		std::optional<tl::function_ref<bool(SDL_Event &)>> eventHandler;
 
 		switch (shownMenu) {
 		case ShownMenuType::Categories: {
@@ -419,11 +454,21 @@
 			}
 		} break;
 		case ShownMenuType::Settings: {
+			bool foundSelectedOption = false;
+			std::optional<size_t> firstSelectableItemIndex;
 			for (OptionEntryBase *pEntry : selectedCategory->GetEntries()) {
 				if (!IsValidEntry(pEntry))
 					continue;
-				if (selectedOption == pEntry)
+
+				MaybeAddGameplaySectionHeader(pEntry);
+
+				if (!firstSelectableItemIndex.has_value())
+					firstSelectableItemIndex = vecDialogItems.size();
+				if (selectedOption == pEntry) {
 					itemToSelect = vecDialogItems.size();
+					foundSelectedOption = true;
+				}
+
 				auto formatArgs = CreateDrawStringFormatArgForEntry(pEntry);
 				const int optionId = static_cast<int>(vecOptions.size());
 				if (NeedsTwoLinesToDisplayOption(formatArgs)) {
@@ -434,6 +479,10 @@
 				}
 				vecOptions.push_back(pEntry);
 			}
+			// If previously selected option doesn't exist (e.g., became invisible),
+			// set focus on first real option, not on header.
+			if (!foundSelectedOption && firstSelectableItemIndex.has_value())
+				itemToSelect = *firstSelectableItemIndex;
 		} break;
 		case ShownMenuType::ListOption: {
 			auto *pOptionList = static_cast<OptionEntryListBase *>(selectedOption);
@@ -452,7 +501,7 @@
 				if (SelectedItem != IndexKeyOrPadInput)
 					return false;
 				uint32_t key = SDLK_UNKNOWN;
 				switch (event.type) {
 				case SDL_EVENT_KEY_DOWN: {
 					SDL_Keycode keycode = SDLC_EventKey(event);
 					remap_keyboard_key(&keycode);