1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 20:22:58 +08:00

Merge pull request from bdach/twemoji-flags

Update flag sizes after switch to twemoji assets
This commit is contained in:
Dean Herbert 2022-06-16 15:55:05 +09:00 committed by GitHub
commit 1c3cc985bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 13 additions and 13 deletions
osu.Android.props
osu.Game.Tournament
Components
Screens/Drawings/Components
osu.Game
Online/Leaderboards
Overlays
Screens/OnlinePlay/Multiplayer/Participants
Users
osu.Game.csproj
osu.iOS.props

View File

@ -51,7 +51,7 @@
<Reference Include="Java.Interop" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.615.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.616.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.615.0" />
</ItemGroup>
<ItemGroup Label="Transitive Dependencies">

View File

@ -32,7 +32,7 @@ namespace osu.Game.Tournament.Components
{
if (team == null) return;
Size = new Vector2(75, 50);
Size = new Vector2(75, 54);
Masking = true;
CornerRadius = 5;
Child = flagSprite = new Sprite

View File

@ -310,7 +310,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
public class ScrollingTeam : DrawableTournamentTeam
{
public const float WIDTH = 58;
public const float HEIGHT = 41;
public const float HEIGHT = 44;
private readonly Box outline;

View File

@ -183,7 +183,7 @@ namespace osu.Game.Online.Leaderboards
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Size = new Vector2(30f, 20f),
Size = new Vector2(28, 20),
},
new DateLabel(Score.Date)
{

View File

@ -165,7 +165,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
},
new UpdateableFlag(score.User.Country)
{
Size = new Vector2(19, 13),
Size = new Vector2(19, 14),
ShowPlaceholderOnNull = false,
},
username,

View File

@ -116,7 +116,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Size = new Vector2(19, 13),
Size = new Vector2(19, 14),
Margin = new MarginPadding { Top = 3 }, // makes spacing look more even
ShowPlaceholderOnNull = false,
},

View File

@ -133,7 +133,7 @@ namespace osu.Game.Overlays.Profile.Header
{
userFlag = new UpdateableFlag
{
Size = new Vector2(30, 20),
Size = new Vector2(28, 20),
ShowPlaceholderOnNull = false,
},
userCountryText = new OsuSpriteText

View File

@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Rankings
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(30, 20)
Size = new Vector2(28, 20)
},
countryName = new OsuSpriteText
{

View File

@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Rankings.Tables
{
new UpdateableFlag(GetCountry(item))
{
Size = new Vector2(30, 20),
Size = new Vector2(28, 20),
ShowPlaceholderOnNull = false,
},
CreateFlagContent(item)

View File

@ -125,7 +125,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Size = new Vector2(30, 20),
Size = new Vector2(28, 20),
Country = user?.Country
},
new OsuSpriteText

View File

@ -53,7 +53,7 @@ namespace osu.Game.Users
protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country)
{
Size = new Vector2(39, 26),
Size = new Vector2(36, 26),
Action = Action,
};

View File

@ -37,7 +37,7 @@
</PackageReference>
<PackageReference Include="Realm" Version="10.14.0" />
<PackageReference Include="ppy.osu.Framework" Version="2022.615.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.615.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.616.0" />
<PackageReference Include="Sentry" Version="3.17.1" />
<PackageReference Include="SharpCompress" Version="0.31.0" />
<PackageReference Include="NUnit" Version="3.13.3" />

View File

@ -62,7 +62,7 @@
</ItemGroup>
<ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Framework.iOS" Version="2022.615.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.615.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.616.0" />
</ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
<PropertyGroup>