h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-21 08:52:54 +08:00
Code Issues Releases Wiki Activity

Revert "Renamed UpdateableFlag to ClickableUpdateableFlag."

Browse Source 
This reverts commit 671177e871.
This commit is contained in:
yesseruser 2023-11-22 15:25:43 +01:00
parent be8b59e59d
commit 08e0279d72
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Menus
AddStep("click on flag", () => AddStep("click on flag", () =>
{ {
InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<ClickableUpdateableFlag>().First()); InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<UpdateableFlag>().First());
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden); AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden);

2
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -180,7 +180,7 @@ namespace osu.Game.Online.Leaderboards
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
new ClickableUpdateableFlag(user.CountryCode) new UpdateableFlag(user.CountryCode)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,

2
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -157,7 +157,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Margin = new MarginPadding { Right = horizontal_inset }, Margin = new MarginPadding { Right = horizontal_inset },
Text = score.DisplayAccuracy, Text = score.DisplayAccuracy,
}, },
new ClickableUpdateableFlag(score.User.CountryCode) new UpdateableFlag(score.User.CountryCode)
{ {
Size = new Vector2(19, 14), Size = new Vector2(19, 14),
ShowPlaceholderOnUnknown = false, ShowPlaceholderOnUnknown = false,

4
osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly UpdateableAvatar avatar; private readonly UpdateableAvatar avatar;
private readonly LinkFlowContainer usernameText; private readonly LinkFlowContainer usernameText;
private readonly DrawableDate achievedOn; private readonly DrawableDate achievedOn;
private readonly ClickableUpdateableFlag flag; private readonly UpdateableFlag flag;
public TopScoreUserSection() public TopScoreUserSection()
{ {
@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
}, },
} }
}, },
flag = new ClickableUpdateableFlag flag = new UpdateableFlag
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,

4
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Header
private OsuSpriteText usernameText = null!; private OsuSpriteText usernameText = null!;
private ExternalLinkButton openUserExternally = null!; private ExternalLinkButton openUserExternally = null!;
private OsuSpriteText titleText = null!; private OsuSpriteText titleText = null!;
private ClickableUpdateableFlag userFlag = null!; private UpdateableFlag userFlag = null!;
private OsuHoverContainer userCountryContainer = null!; private OsuHoverContainer userCountryContainer = null!;
private OsuSpriteText userCountryText = null!; private OsuSpriteText userCountryText = null!;
private GroupBadgeFlow groupBadgeFlow = null!; private GroupBadgeFlow groupBadgeFlow = null!;
@ -162,7 +162,7 @@ namespace osu.Game.Overlays.Profile.Header
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Children = new Drawable[] Children = new Drawable[]
{ {
userFlag = new ClickableUpdateableFlag userFlag = new UpdateableFlag
{ {
Size = new Vector2(28, 20), Size = new Vector2(28, 20),
ShowPlaceholderOnUnknown = false, ShowPlaceholderOnUnknown = false,

4
osu.Game/Overlays/Rankings/CountryPill.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
private readonly Container content; private readonly Container content;
private readonly Box background; private readonly Box background;
private readonly ClickableUpdateableFlag flag; private readonly UpdateableFlag flag;
private readonly OsuSpriteText countryName; private readonly OsuSpriteText countryName;
public CountryPill() public CountryPill()
@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Rankings
Spacing = new Vector2(5, 0), Spacing = new Vector2(5, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
flag = new ClickableUpdateableFlag flag = new UpdateableFlag
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

2
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Rankings.Tables
Margin = new MarginPadding { Bottom = row_spacing }, Margin = new MarginPadding { Bottom = row_spacing },
Children = new[] Children = new[]
{ {
new ClickableUpdateableFlag(GetCountryCode(item)) new UpdateableFlag(GetCountryCode(item))
{ {
Size = new Vector2(28, 20), Size = new Vector2(28, 20),
ShowPlaceholderOnUnknown = false, ShowPlaceholderOnUnknown = false,

2
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
View File

@ -123,7 +123,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
User = user User = user
}, },
new ClickableUpdateableFlag new UpdateableFlag
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,

4
osu.Game/Screens/Play/HUD/PlayerFlag.cs
View File

@ -12,14 +12,14 @@ namespace osu.Game.Screens.Play.HUD
{ {
public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
{ {
private readonly ClickableUpdateableFlag flag; private readonly UpdateableFlag flag;
private const float default_size = 40f; private const float default_size = 40f;
public PlayerFlag() public PlayerFlag()
{ {
Size = new Vector2(default_size, default_size / 1.4f); Size = new Vector2(default_size, default_size / 1.4f);
InternalChild = flag = new ClickableUpdateableFlag InternalChild = flag = new UpdateableFlag
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}; };

4
osu.Game/Users/Drawables/ClickableUpdateableFlag.cs → osu.Game/Users/Drawables/UpdateableFlag.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Overlays;
namespace osu.Game.Users.Drawables namespace osu.Game.Users.Drawables
{ {
public partial class ClickableUpdateableFlag : ModelBackedDrawable<CountryCode> public partial class UpdateableFlag : ModelBackedDrawable<CountryCode>
{ {
public CountryCode CountryCode public CountryCode CountryCode
{ {
@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
/// </summary> /// </summary>
public Action? Action; public Action? Action;
public ClickableUpdateableFlag(CountryCode countryCode = CountryCode.Unknown) public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
{ {
CountryCode = countryCode; CountryCode = countryCode;
} }

2
osu.Game/Users/ExtendedUserPanel.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Users
protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false); protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false);
protected ClickableUpdateableFlag CreateFlag() => new ClickableUpdateableFlag(User.CountryCode) protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.CountryCode)
{ {
Size = new Vector2(36, 26), Size = new Vector2(36, 26),
Action = Action, Action = Action,