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

Merge pull request #422 from Tom94/no-negative-margin

Browse Source 
Remove usages of negative Margin / Padding
This commit is contained in:
Dean Herbert 2017-03-03 10:05:55 +09:00 committed by GitHub
commit ae1d51bc9b
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 5dbb4a5134dacb2e98ab8f2af219039a72bd32e6 Subproject commit 6f97c4b9df20436cda6a6fcfc87ab42185d60db4

1
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -52,7 +52,6 @@ namespace osu.Game.Beatmaps.Drawables
}, },
artist = new OsuSpriteText artist = new OsuSpriteText
{ {
Margin = new MarginPadding { Top = -1 },
Font = @"Exo2.0-SemiBoldItalic", Font = @"Exo2.0-SemiBoldItalic",
Text = beatmap.BeatmapSetInfo.Metadata.Artist, Text = beatmap.BeatmapSetInfo.Metadata.Artist,
TextSize = 17, TextSize = 17,

5
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -57,10 +57,7 @@ namespace osu.Game.Graphics.UserInterface
c1.Origin = c1.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopLeft : Anchor.TopRight; c1.Origin = c1.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopLeft : Anchor.TopRight;
c2.Origin = c2.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopRight : Anchor.TopLeft; c2.Origin = c2.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopRight : Anchor.TopLeft;
Margin = new MarginPadding X = (value & Anchor.x2) > 0 ? SIZE_RETRACTED.X * shear * 0.5f : 0;
{
Right = (value & Anchor.x2) > 0 ? -SIZE_RETRACTED.X * shear * 0.5f : 0
};
c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1; c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1;
c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0; c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0;