h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 10:23:20 +08:00
Code Issues 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
{
string settingDescription = string.IsNullOrEmpty(SettingDescription) ? string.Empty : $" ({SettingDescription})";
return $"{Name}{settingDescription}";
string description = 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())
{
object bindableObj = property.GetValue(this);
bool? settingIsDefault = (bindableObj as IHasDefaultValue)?.IsDefault;
string tooltipText = settingIsDefault == true ? string.Empty : attr.Label + " " + bindableObj;
tooltipTexts.Add(tooltipText);
if ((bindableObj as IHasDefaultValue)?.IsDefault == true)
continue;
tooltipTexts.Add($"{attr.Label} {bindableObj}");
}
string joinedTooltipText = string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));
return $"{joinedTooltipText}";
return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));
}
}