sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mod-overlay

Browse Source
This commit is contained in:
Seth
2017-03-03 01:11:15 -04:00
committed by GitHub
parent e399d6c6d1 78a0bce3bb
commit 1891bdf51e
16 changed files with 72 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -14,6 +14,8 @@ namespace osu.Game.Graphics.UserInterface
{
protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize);
public override bool AllowClipboardExport => false;
public class PasswordMaskChar : Container
{
private CircularContainer circle;

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;
c2.Origin = c2.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopRight : Anchor.TopLeft;
Margin = new MarginPadding
{
Right = (value & Anchor.x2) > 0 ? -SIZE_RETRACTED.X * shear * 0.5f : 0
};
X = (value & Anchor.x2) > 0 ? SIZE_RETRACTED.X * shear * 0.5f : 0;
c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1;
c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0;