RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 08:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add setting to allow hiding all country flags

Browse Source 
There have been enough requests for this at this point to implement it.
This commit is contained in:
Dean Herbert 2024-05-10 20:32:21 +08:00
parent 5285b35d64
commit b026309e36
No known key found for this signature in database
4 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -200,6 +200,8 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
SetDefault(OsuSetting.EditorShowSpeedChanges, false);
SetDefault(OsuSetting.HideCountryFlags, false);
SetDefault(OsuSetting.MultiplayerRoomFilter, RoomPermissionsFilter.All);
SetDefault(OsuSetting.LastProcessedMetadataId, -1);
@ -435,6 +437,7 @@ namespace osu.Game.Configuration
TouchDisableGameplayTaps,
ModSelectTextSearchStartsActive,
UserOnlineStatus,
MultiplayerRoomFilter
MultiplayerRoomFilter,
HideCountryFlags,
}
}

5
osu.Game/Localisation/OnlineSettingsStrings.cs
View File

@ -79,6 +79,11 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString DiscordPresenceOff => new TranslatableString(getKey(@"discord_presence_off"), @"Off");
/// <summary>
/// "Hide country flags"
/// </summary>
public static LocalisableString HideCountryFlags => new TranslatableString(getKey(@"hide_country_flags"), @"Hide country flags");
private static string getKey(string key) => $"{prefix}:{key}";
}
}

5
osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
View File

@ -28,6 +28,11 @@ namespace osu.Game.Overlays.Settings.Sections.Online
LabelText = OnlineSettingsStrings.NotifyOnPrivateMessage,
Current = config.GetBindable<bool>(OsuSetting.NotifyOnPrivateMessage)
},
new SettingsCheckbox
{
LabelText = OnlineSettingsStrings.HideCountryFlags,
Current = config.GetBindable<bool>(OsuSetting.HideCountryFlags)
},
};
}
}

31
osu.Game/Users/Drawables/UpdateableFlag.cs
View File

@ -3,9 +3,11 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays;
@ -13,14 +15,20 @@ namespace osu.Game.Users.Drawables
{
public partial class UpdateableFlag : ModelBackedDrawable<CountryCode>
{
private CountryCode countryCode;
public CountryCode CountryCode
{
get => Model;
set => Model = value;
get => countryCode;
set
{
countryCode = value;
updateModel();
}
}
/// <summary>
/// Whether to show a place holder on unknown country.
/// Whether to show a placeholder on unknown country.
/// </summary>
public bool ShowPlaceholderOnUnknown = true;
@ -30,9 +38,21 @@ namespace osu.Game.Users.Drawables
/// </summary>
public Action? Action;
private readonly Bindable<bool> hideFlags = new BindableBool();
[Resolved]
private RankingsOverlay? rankingsOverlay { get; set; }
public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
{
CountryCode = countryCode;
hideFlags.BindValueChanged(_ => updateModel());
}
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
config.BindWith(OsuSetting.HideCountryFlags, hideFlags);
}
protected override Drawable? CreateDrawable(CountryCode countryCode)
@ -54,14 +74,13 @@ namespace osu.Game.Users.Drawables
};
}
[Resolved]
private RankingsOverlay? rankingsOverlay { get; set; }
protected override bool OnClick(ClickEvent e)
{
Action?.Invoke();
rankingsOverlay?.ShowCountry(CountryCode);
return true;
}
private void updateModel() => Model = hideFlags.Value ? CountryCode.Unknown : countryCode;
}
}