Merge branch 'master' into profile

This commit is contained in:
Dean Herbert
2017-06-23 22:51:31 +09:00
committed by GitHub
13 changed files with 866 additions and 8 deletions

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);
}
}