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

Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes

Browse Source
This commit is contained in:
EVAST9919 2017-06-23 10:00:51 +03:00
commit 17494aed85
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit eed53d35f999ae08a6d233c046aa333a7623c5f0
Subproject commit 97ff3376d1bdac3703d442e62f5ee6a36eb3b73f

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

@ -63,8 +63,12 @@ namespace osu.Game.Graphics.UserInterface
X = (value & Anchor.x2) > 0 ? SIZE_RETRACTED.X * shear * 0.5f : 0;
Remove(c1);
Remove(c2);
c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1;
c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0;
Add(c1);
Add(c2);
}
}