From 603b9d95fc426cee7a9a2d49a30a78fcb234cfd5 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Sun, 1 Feb 2015 10:09:59 -0500
Subject: [PATCH] Allow OnlyShowActiveSection wheel to include current section
 title

IIDX hides inactive sections, but unlike the current behavior of our
OnlyShowActiveSection metric (based on certain Pumps according to
DaisukeMaster's comment), it retains the section title so that the
section can be closed normally.

New metric: MusicWheel.HideActiveSectionTitle, defaulting to true in
_fallback.  A bit unfortunate, but keeps backward compatibility with the
existing behavior of OnlyShowActiveSection.

If neither metric is true, wheel displays all titles plus the contents
of the active section (if any).

If OSAS is true but HAST is false, wheel displays the active section
title plus its contents, or all titles if no section is active.

If both are true, wheel displays only the active section's contents, or
all titles if no section is active.
---
 Themes/_fallback/metrics.ini |  1 +
 src/MusicWheel.cpp           | 18 +++++++++++++-----
 src/MusicWheel.h             |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 2d823d19dc..9d961f7f39 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -906,6 +906,7 @@ SwitchSeconds=0.10
 RandomPicksLockedSongs=true
 UseSectionsWithPreferredGroup=false
 OnlyShowActiveSection=false
+HideActiveSectionTitle=true
 RemindWheelPositions=false
 #
 RouletteSwitchSeconds=0.05
diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp
index e1a3b9b641..c70537a21b 100644
--- a/src/MusicWheel.cpp
+++ b/src/MusicWheel.cpp
@@ -87,6 +87,7 @@ void MusicWheel::Load( RString sType )
 	SHOW_EASY_FLAG			.Load(sType,"UseEasyMarkerFlag");
 	USE_SECTIONS_WITH_PREFERRED_GROUP		.Load(sType,"UseSectionsWithPreferredGroup");
 	HIDE_INACTIVE_SECTIONS		.Load(sType,"OnlyShowActiveSection");
+	HIDE_ACTIVE_SECTION_TITLE		.Load(sType,"HideActiveSectionTitle");
 	REMIND_WHEEL_POSITIONS		.Load(sType,"RemindWheelPositions");
 	vector<RString> vsModeChoiceNames;
 	split( MODE_MENU_CHOICE_NAMES, ",", vsModeChoiceNames );
@@ -1358,14 +1359,21 @@ void MusicWheel::SetOpenSection( RString group )
 	for( unsigned i = 0; i < from.size(); ++i )
 	{
 		MusicWheelItemData &d = *from[i];
-		// Don't show songs outside the current group
+
+		// Hide songs/courses which are not in the active section
 		if( (d.m_Type == WheelItemDataType_Song || d.m_Type == WheelItemDataType_Course) && !d.m_sText.empty() &&
 			 d.m_sText != group )
 			 continue;
-		// In certain situations (e.g. simulating Pump it Up), themes may
-		// want to hide inactive group headings as well.
-		if( HIDE_INACTIVE_SECTIONS && d.m_Type == WheelItemDataType_Section && group != "" )
-			continue;
+
+		// In certain situations (e.g. simulating Pump it Up or IIDX),
+		// themes may want to hide inactive section headings as well.
+		if( HIDE_INACTIVE_SECTIONS && d.m_Type == WheelItemDataType_Section && group != "" ) {
+			// Based on the HideActiveSectionTitle metric, we either
+			// hide all section titles, or only those which are not
+			// currently open.
+			if ( HIDE_ACTIVE_SECTION_TITLE || d.m_sText != group )
+				continue;
+		}
 
 		// If AUTO_SET_STYLE, hide courses that prefer a style that isn't available.
 		if( d.m_Type == WheelItemDataType_Course && CommonMetrics::AUTO_SET_STYLE )
diff --git a/src/MusicWheel.h b/src/MusicWheel.h
index d0fb3c107f..83c20aa29f 100644
--- a/src/MusicWheel.h
+++ b/src/MusicWheel.h
@@ -90,6 +90,7 @@ protected:
 	// sm-ssc additions:
 	ThemeMetric<bool>		USE_SECTIONS_WITH_PREFERRED_GROUP;
 	ThemeMetric<bool>		HIDE_INACTIVE_SECTIONS;
+	ThemeMetric<bool>		HIDE_ACTIVE_SECTION_TITLE;
 	ThemeMetric<bool>		REMIND_WHEEL_POSITIONS;
 	ThemeMetric<RageColor>	ROULETTE_COLOR;
 	ThemeMetric<RageColor>	RANDOM_COLOR;