Fixes

kinsi55 · May 8, 2023 · 0581c7c · 0581c7c
1 parent a290195
commit 0581c7c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/UI/Views/FilterView.bsml b/UI/Views/FilterView.bsml
@@ -27,7 +27,7 @@
 				</vertical>
 				<vertical child-control-height='false' bg='panel-top' pad='2' pad-bottom='1' pad-top='1' preferred-width='64'>
 					<text text='&lt;color=#DDD>Ranked' align='Center' underlined='true' bold='true' font-size='3.5' color='#69B' size-delta-y='5'/>
-					<list-setting text='Ranked Status' value="rankedState" choices='rankedFilterOptions' bind-value="true" apply-on-change="true" on-change="UpdateData"/>
+					<dropdown-list-setting text='Ranked Status' value="rankedState" choices='rankedFilterOptions' bind-value="true" apply-on-change="true" on-change="UpdateData"/>
 					<slider-setting text='Stars' value="minimumStars" bind-value="true" apply-on-change="true" max='13' increment='0.2' formatter='FormatShortFloat' on-change="UpdateData"/>
 					<slider-setting text='MERGE_TO_PREV' value="maximumStars" bind-value="true" apply-on-change="true" max='~STAR_FILTER_MAX' increment='0.2' formatter='FormatMaxStarsFloat' on-change="UpdateData"/>
 				</vertical>

diff --git a/UI/Views/SplitViews/Settings.bsml b/UI/Views/SplitViews/Settings.bsml
@@ -1,5 +1,5 @@
 <bg xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='- https://raw.githubusercontent.com/monkeymanboy/BSML-Docs/gh-pages/BSMLSchema.xsd'>
-	<modal clickerino-offerino-closerino='true' hide-event='CloseSettingsModal' show-event='ShowModal' size-delta-x='80' size-delta-y='45'>
+	<modal clickerino-offerino-closerino='true' hide-event='CloseSettingsModal' show-event='ShowModal' size-delta-x='80' size-delta-y='55'>
 		<vertical horizontal-fit='Unconstrained' pad='4' pad-top='9'>
 			<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
 				<text text='BetterSongSearch - Settings' align='Center'/>
@@ -9,6 +9,7 @@
 				<toggle-setting text='Download Song previews' value="loadSongPreviews" bind-value="true" apply-on-change="true" hover-hint="Load and play a short preview of songs not downloaded yet"/>
 				<toggle-setting text='Smaller Font size' value="smallerFontSize" bind-value="true" apply-on-change="true" hover-hint="Makes the Font size of the Song List smaller"/>
 			</macro.as-host>
+			<list-setting text='Preferred Leaderboard' value="preferredLeaderboard" choices="preferredLeaderboardChoices" bind-value="true" apply-on-change="true" hover-hint="If a song is ranked on multiple leaderboards this decides which leaderboards Star value to display and use when filtering"/>
 			<toggle-setting id="chinaToggle" text='Use Chinese BeatSaver Mirror' on-change="ChinaToggled"/>
 			<horizontal pad-top="2">
 				<button text='Close' click-event='CloseSettingsModal'/>

diff --git a/UI/Views/SplitViews/Settings.cs b/UI/Views/SplitViews/Settings.cs
@@ -16,6 +16,17 @@ class Settings {
 		public static readonly Settings instance = new Settings();
 		Settings() { }
 
+		static readonly IReadOnlyList<object> preferredLeaderboardChoices = new List<object>() { "ScoreSaber", "BeatLeader" };
+
+		string preferredLeaderboard {
+			get => PluginConfig.Instance.preferredLeaderboard;
+			set {
+				PluginConfig.Instance.preferredLeaderboard = value;
+
+				FilterView.limitedUpdateData.CallNextFrame();
+			}
+		}
+
 
 		[UIParams] readonly BSMLParserParams parserParams = null;
 

diff --git a/Util/SongAndDiffWrappers.cs b/Util/SongAndDiffWrappers.cs
@@ -117,7 +117,7 @@ public RankedStates GetTargetedRankLeaderboardService() {
 				if(rStates.HasFlag(RankedStates.ScoresaberRanked) &&
 					// Filtering by BeatLeader ranked
 					FilterView.currentFilter.rankedState != (string)FilterOptions.rankedFilterOptions[2] &&
-					PluginConfig.Instance.preferredLeaderboard != "BeatLeader"
+					(PluginConfig.Instance.preferredLeaderboard != "BeatLeader" || !rStates.HasFlag(RankedStates.BeatleaderRanked))
 				)
 					return RankedStates.ScoresaberRanked;