Merge pull request #455 from djpohly/iidx-wheel-sections

Allow OnlyShowActiveSection wheel to include current section title

Themes/_fallback/metrics.ini

@@ -906,6 +906,7 @@ SwitchSeconds=0.10
 RandomPicksLockedSongs=true
 UseSectionsWithPreferredGroup=false
 OnlyShowActiveSection=false
+HideActiveSectionTitle=true
 RemindWheelPositions=false
 #
 RouletteSwitchSeconds=0.05

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 )

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;