h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:23:22 +08:00
Code Issues Releases Wiki Activity

Remove masking from Triangles to simplify OsuLogo masking hierarchy.

Browse Source
This commit is contained in:
Dean Herbert 2016-12-01 21:12:37 +09:00
parent 4b74ea7586
commit 511dab32ef
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -19,7 +19,6 @@ namespace osu.Game.Graphics.Backgrounds
public Triangles() public Triangles()
{ {
Masking = true;
Alpha = 0.3f; Alpha = 0.3f;
} }

1
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -156,6 +156,7 @@ namespace osu.Game.Overlays.Toolbar
public OpaqueBackground() public OpaqueBackground()
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Masking = true;
Children = new Drawable[] Children = new Drawable[]
{ {

34
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Menu
private Container logoHoverContainer; private Container logoHoverContainer;
private MenuVisualisation vis; private MenuVisualisation vis;
private CircularContainer colourAndTriangles; private Container colourAndTriangles;
public Action Action; public Action Action;
@ -84,14 +84,14 @@ namespace osu.Game.Screens.Menu
{ {
logoContainer = new CircularContainer logoContainer = new CircularContainer
{ {
AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Scale = new Vector2(0.8f),
Children = new Drawable[] Children = new Drawable[]
{ {
colourAndTriangles = new CircularContainer colourAndTriangles = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Scale = new Vector2(0.78f),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Children = new Drawable[] Children = new Drawable[]
@ -107,14 +107,15 @@ namespace osu.Game.Screens.Menu
}, },
} }
}, },
logo = new Sprite
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(0.5f),
},
}, },
}, },
logo = new Sprite
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(0.5f),
},
rippleContainer = new Container rippleContainer = new Container
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -205,19 +206,6 @@ namespace osu.Game.Screens.Menu
Alpha = 1; Alpha = 1;
} }
public override float CornerRadius
{
get
{
return DrawSize.X / 2f;
}
set
{
Debug.Assert(false, "Cannot manually set CornerRadius of CircularContainer.");
}
}
protected override Sprite CreateTriangle() protected override Sprite CreateTriangle()
{ {
var triangle = base.CreateTriangle(); var triangle = base.CreateTriangle();