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

Unify MarginPadding

Browse Source
This commit is contained in:
HoutarouOreki 2018-07-25 17:04:36 +02:00
parent a7a6e52c16
commit 3e6968b57e
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Changelog/ChangelogBadges.cs
View File

@ -15,8 +15,8 @@ namespace osu.Game.Overlays.Changelog
public class ChangelogBadges : Container
{
private const float container_height = 106.5f;
private const float padding_y = 20;
private const float padding_x = 85;
private const float vertical_padding = 20;
private const float horizontal_padding = 85;
public delegate void SelectionHandler(APIChangelog releaseStream, EventArgs args);
@ -40,13 +40,7 @@ namespace osu.Game.Overlays.Changelog
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding
{
Top = padding_y,
Bottom = padding_y,
Left = padding_x,
Right = padding_x,
},
Padding = new MarginPadding { Vertical = vertical_padding, Horizontal = horizontal_padding },
},
};
}

6
osu.Game/Overlays/Changelog/ChangelogContent.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Changelog
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Direction = FillDirection.Vertical;
Padding = new MarginPadding{ Bottom = 100, };
Padding = new MarginPadding{ Bottom = 100 };
}
public void ShowListing(APIChangelog[] changelog)
@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Changelog
RelativeSizeAxes = Axes.X,
Height = 2,
Colour = new Color4(17, 17, 17, 255),
Margin = new MarginPadding { Top = 30, },
Margin = new MarginPadding { Top = 30 },
});
}
changelogContentGroup = new ChangelogContentGroup(build, true);
@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Changelog
RelativeSizeAxes = Axes.X,
Height = 1,
Colour = new Color4(32, 24, 35, 255),
Margin = new MarginPadding { Top = 30, },
Margin = new MarginPadding { Top = 30 },
});
changelogContentGroup = new ChangelogContentGroup(build, false);

2
osu.Game/Overlays/Changelog/ChangelogContentGroup.cs
View File

@ -105,7 +105,7 @@ namespace osu.Game.Overlays.Changelog
Font = @"Exo2.0-Medium",
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Margin = new MarginPadding { Top = 5 }
Margin = new MarginPadding { Top = 5 },
},
ChangelogEntries = new FillFlowContainer
{

6
osu.Game/Overlays/Changelog/Header/TextBadgePair.cs
View File

@ -39,11 +39,7 @@ namespace osu.Game.Overlays.Changelog.Header
Text = displayText,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding
{
Top = 5,
Bottom = 15,
}
Margin = new MarginPadding { Top = 5, Bottom = 15 },
},
LineBadge = new LineBadge(startCollapsed)
{

2
osu.Game/Overlays/Changelog/StreamBadge.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Changelog
Text = LatestBuild.UpdateStream.DisplayName,
Font = @"Exo2.0-Bold",
TextSize = 14, // web: 12,
Margin = new MarginPadding { Top = 6, },
Margin = new MarginPadding { Top = 6 },
},
new SpriteText
{