sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-31 10:27:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify string construction logic

Browse Source
This commit is contained in:
Dean Herbert 2020-03-23 15:20:56 +09:00
parent a6b153673e
commit 205f4dcb54
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -60,8 +60,9 @@ namespace osu.Game.Rulesets.Mods
{ {
get get
{ {
string settingDescription = string.IsNullOrEmpty(SettingDescription) ? string.Empty : $" ({SettingDescription})"; string description = SettingDescription;
return $"{Name}{settingDescription}";
return string.IsNullOrEmpty(description) ? Name : $"{Name} ({description})";
} }
} }
@ -81,13 +82,14 @@ namespace osu.Game.Rulesets.Mods
foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties()) foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
{ {
object bindableObj = property.GetValue(this); object bindableObj = property.GetValue(this);
bool? settingIsDefault = (bindableObj as IHasDefaultValue)?.IsDefault;
string tooltipText = settingIsDefault == true ? string.Empty : attr.Label + " " + bindableObj; if ((bindableObj as IHasDefaultValue)?.IsDefault == true)
tooltipTexts.Add(tooltipText); continue;
tooltipTexts.Add($"{attr.Label} {bindableObj}");
} }
string joinedTooltipText = string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s))); return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));
return $"{joinedTooltipText}";
} }
} }